@dbml/parse 7.0.0 → 7.1.0-alpha.0

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

@@ -1,13 +1,13 @@
-import { ProgramNode } from '../core/parser/nodes';
-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, DiagramViewSyncOperation, DiagramViewBlock } from './queries/transform';
-import { splitQualifiedIdentifier, unescapeString, escapeString, formatRecordValue, isValidIdentifier, addDoubleQuoteIfNeeded } from './queries/utils';
-export { ScopeKind } from './types';
-export type { TextEdit, TableNameInput, DiagramViewSyncOperation, DiagramViewBlock };
-export { splitQualifiedIdentifier, unescapeString, escapeString, formatRecordValue, isValidIdentifier, addDoubleQuoteIfNeeded };
+import { ProgramNode } from '../core/types/nodes';
+import { default as Report } from '../core/types/report';
+import { Database } from '../core/types/schemaJson';
+import { SyntaxToken } from '../core/types/tokens';
+import { DBMLCompletionItemProvider, DBMLDefinitionProvider, DBMLDiagnosticsProvider, DBMLReferencesProvider } from '../services/index';
+import { DiagramViewBlock, DiagramViewSyncOperation, TableNameInput, TextEdit } from './queries/transform';
+import { addDoubleQuoteIfNeeded, escapeString, formatRecordValue, isValidIdentifier, splitQualifiedIdentifier, unescapeString } from './queries/utils';
+export { ScopeKind, } from './types';
+export type { TextEdit, TableNameInput, DiagramViewSyncOperation, DiagramViewBlock, };
+export { splitQualifiedIdentifier, unescapeString, escapeString, formatRecordValue, isValidIdentifier, addDoubleQuoteIfNeeded, };
 export default class Compiler {
     private source;
     private cache;
@@ -36,13 +36,13 @@ export default class Compiler {
         }>;
         ast: () => Readonly<ProgramNode>;
         errors: () => readonly Readonly<import('..').CompileError>[];
-        warnings: () => readonly Readonly<import('../core/errors').CompileWarning>[];
+        warnings: () => readonly Readonly<import('../core/types').CompileWarning>[];
         tokens: () => Readonly<SyntaxToken>[];
         rawDb: () => Readonly<Database> | undefined;
-        publicSymbolTable: () => Readonly<import('../core/analyzer/symbol/symbolTable').default>;
+        publicSymbolTable: () => Readonly<import('../core/types/symbol/symbolTable').default>;
     };
     readonly container: {
-        stack: (offset: number) => readonly Readonly<import('../core/parser/nodes').SyntaxNode>[];
+        stack: (offset: number) => readonly Readonly<import('../core/types/nodes').SyntaxNode>[];
         token: (offset: number) => {
             token: SyntaxToken;
             index: number;
@@ -50,20 +50,20 @@ export default class Compiler {
             token: undefined;
             index: undefined;
         };
-        element: (offset: number) => Readonly<ProgramNode | import('../core/parser/nodes').ElementDeclarationNode>;
-        scope: (offset: number) => Readonly<import('../core/analyzer/symbol/symbolTable').default> | undefined;
+        element: (offset: number) => Readonly<ProgramNode | import('../core/types/nodes').ElementDeclarationNode>;
+        scope: (offset: number) => Readonly<import('../core/types/symbol/symbolTable').default> | undefined;
         scopeKind: (offset: number) => import('./types').ScopeKind;
     };
     readonly symbol: {
-        ofName: (nameStack: string[], owner: ProgramNode | import('../core/parser/nodes').ElementDeclarationNode) => {
-            symbol: import('../core/analyzer/symbol/symbols').NodeSymbol;
-            kind: import('../core/analyzer/symbol/symbolIndex').SymbolKind;
+        ofName: (nameStack: string[], owner: ProgramNode | import('../core/types/nodes').ElementDeclarationNode) => {
+            symbol: import('../core/types/symbol/symbols').NodeSymbol;
+            kind: import('../core/types').SymbolKind;
             name: string;
         }[];
-        members: (ownerSymbol: import('../core/analyzer/symbol/symbols').NodeSymbol) => {
-            symbol: import('../core/analyzer/symbol/symbols').NodeSymbol;
+        members: (ownerSymbol: import('../core/types/symbol/symbols').NodeSymbol) => {
+            symbol: import('../core/types/symbol/symbols').NodeSymbol;
             name: string;
-            kind: import('../core/analyzer/symbol/symbolIndex').SymbolKind;
+            kind: import('../core/types').SymbolKind;
         }[];
     };
     initMonacoServices(): {

package/dist/src/compiler/queries/container/element.d.ts

@@ -1,3 +1,3 @@
+import { ElementDeclarationNode, ProgramNode } from '../../../core/types/nodes';
 import { default as Compiler } from '../../index';
-import { ElementDeclarationNode, ProgramNode } from '../../../core/parser/nodes';
 export declare function containerElement(this: Compiler, offset: number): Readonly<ElementDeclarationNode | ProgramNode>;

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

@@ -1,5 +1,5 @@
-export { containerStack } from './stack';
-export { containerToken } from './token';
-export { containerElement } from './element';
-export { containerScope } from './scope';
-export { containerScopeKind } from './scopeKind';
+export { containerStack, } from './stack';
+export { containerToken, } from './token';
+export { containerElement, } from './element';
+export { containerScope, } from './scope';
+export { containerScopeKind, } from './scopeKind';

package/dist/src/compiler/queries/container/scope.d.ts

@@ -1,3 +1,3 @@
+import { default as SymbolTable } from '../../../core/types/symbol/symbolTable';
 import { default as Compiler } from '../../index';
-import { default as SymbolTable } from '../../../core/analyzer/symbol/symbolTable';
 export declare function containerScope(this: Compiler, offset: number): Readonly<SymbolTable> | undefined;

package/dist/src/compiler/queries/container/stack.d.ts

@@ -1,3 +1,3 @@
+import { SyntaxNode } from '../../../core/types/nodes';
 import { default as Compiler } from '../../index';
-import { SyntaxNode } from '../../../core/parser/nodes';
 export declare function containerStack(this: Compiler, offset: number): readonly Readonly<SyntaxNode>[];

package/dist/src/compiler/queries/container/token.d.ts

@@ -1,5 +1,5 @@
+import { SyntaxToken } from '../../../core/types/tokens';
 import { default as Compiler } from '../../index';
-import { SyntaxToken } from '../../../core/lexer/tokens';
 export declare function containerToken(this: Compiler, offset: number): {
     token: SyntaxToken;
     index: number;

package/dist/src/compiler/queries/{parse.d.ts → legacy/parse.d.ts}

@@ -1,9 +1,9 @@
-import { default as Compiler } from '../index';
-import { ProgramNode } from '../../core/parser/nodes';
-import { SyntaxToken } from '../../core/lexer/tokens';
-import { CompileError, CompileWarning } from '../../core/errors';
-import { Database } from '../../core/interpreter/types';
-import { default as SymbolTable } from '../../core/analyzer/symbol/symbolTable';
+import { CompileError, CompileWarning } from '../../../core/types/errors';
+import { ProgramNode } from '../../../core/types/nodes';
+import { Database } from '../../../core/types/schemaJson';
+import { default as SymbolTable } from '../../../core/types/symbol/symbolTable';
+import { SyntaxToken } from '../../../core/types/tokens';
+import { default as Compiler } from '../../index';
 export declare function ast(this: Compiler): Readonly<ProgramNode>;
 export declare function errors(this: Compiler): readonly Readonly<CompileError>[];
 export declare function warnings(this: Compiler): readonly Readonly<CompileWarning>[];

package/dist/src/compiler/queries/{symbol.d.ts → legacy/symbol.d.ts}

@@ -1,7 +1,7 @@
-import { default as Compiler } from '../index';
-import { ElementDeclarationNode, ProgramNode } from '../../core/parser/nodes';
-import { NodeSymbol } from '../../core/analyzer/symbol/symbols';
-import { SymbolKind } from '../../core/analyzer/symbol/symbolIndex';
+import { ElementDeclarationNode, ProgramNode } from '../../../core/types/nodes';
+import { SymbolKind } from '../../../core/types/symbol';
+import { NodeSymbol } from '../../../core/types/symbol/symbols';
+import { default as Compiler } from '../../index';
 export declare function symbolMembers(this: Compiler, ownerSymbol: NodeSymbol): {
     symbol: NodeSymbol;
     name: string;

package/dist/src/compiler/queries/{token.d.ts → legacy/token.d.ts}

@@ -1,4 +1,4 @@
-import { default as Compiler } from '../index';
-import { SyntaxToken } from '../../core/lexer/tokens';
+import { SyntaxToken } from '../../../core/types/tokens';
+import { default as Compiler } from '../../index';
 export declare function flatStream(this: Compiler): readonly SyntaxToken[];
 export declare function invalidStream(this: Compiler): readonly SyntaxToken[];

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

@@ -1,4 +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';
+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/utils.d.ts

@@ -1,5 +1,5 @@
-import { default as SymbolTable } from '../../../core/analyzer/symbol/symbolTable';
-import { TableSymbol } from '../../../core/analyzer/symbol/symbols';
+import { default as SymbolTable } from '../../../core/types/symbol/symbolTable';
+import { TableSymbol } from '../../../core/types/symbol/symbols';
 export type TableNameInput = string | {
     schema?: string;
     table: string;

package/dist/src/constants.d.ts

@@ -1,3 +1,7 @@
+import { Filepath } from './core/types/filepath';
 export declare const KEYWORDS_OF_DEFAULT_SETTING: readonly string[];
+export declare const DBML_EXT = ".dbml";
 export declare const NUMERIC_LITERAL_PREFIX: readonly string[];
 export declare const DEFAULT_SCHEMA_NAME = "public";
+export declare const DEFAULT_ENTRY: Filepath;
+export declare const ROOT: Filepath;

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

@@ -1,6 +1,6 @@
-import { ProgramNode } from '../parser/nodes';
-import { default as Report } from '../report';
-import { NodeSymbolIdGenerator } from './symbol/symbols';
+import { ProgramNode } from '../types/nodes';
+import { default as Report } from '../types/report';
+import { NodeSymbolIdGenerator } from '../types/symbol/symbols';
 export default class Analyzer {
     private ast;
     private symbolFactory;

package/dist/src/core/analyzer/binder/binder.d.ts

@@ -1,6 +1,6 @@
-import { ProgramNode } from '../../parser/nodes';
-import { default as Report } from '../../report';
-import { default as SymbolFactory } from '../symbol/factory';
+import { ProgramNode } from '../../types/nodes';
+import { default as Report } from '../../types/report';
+import { default as SymbolFactory } from '../../types/symbol/factory';
 export default class Binder {
     private ast;
     private symbolFactory;

package/dist/src/core/analyzer/binder/elementBinder/checks.d.ts

@@ -1,6 +1,6 @@
+import { CompileError } from '../../../types/errors';
+import { default as SymbolFactory } from '../../../types/symbol/factory';
 import { ElementDeclarationNode, ProgramNode, SyntaxToken } from '../../../..';
-import { CompileError } from '../../../errors';
-import { default as SymbolFactory } from '../../symbol/factory';
 import { ElementBinder } from '../types';
 export default class ChecksBinder implements ElementBinder {
     private symbolFactory;

package/dist/src/core/analyzer/binder/elementBinder/custom.d.ts

@@ -1,8 +1,8 @@
-import { CompileError } from '../../../errors';
+import { CompileError } from '../../../types/errors';
+import { default as SymbolFactory } from '../../../types/symbol/factory';
+import { ElementDeclarationNode, ProgramNode } from '../../../types/nodes';
+import { SyntaxToken } from '../../../types/tokens';
 import { ElementBinder } from '../types';
-import { ElementDeclarationNode, ProgramNode } from '../../../parser/nodes';
-import { SyntaxToken } from '../../../lexer/tokens';
-import { default as SymbolFactory } from '../../symbol/factory';
 export default class CustomBinder implements ElementBinder {
     private symbolFactory;
     private declarationNode;

package/dist/src/core/analyzer/binder/elementBinder/diagramView.d.ts

@@ -1,8 +1,8 @@
-import { ElementDeclarationNode, ProgramNode } from '../../../parser/nodes';
+import { CompileError } from '../../../types/errors';
+import { default as SymbolFactory } from '../../../types/symbol/factory';
+import { ElementDeclarationNode, ProgramNode } from '../../../types/nodes';
+import { SyntaxToken } from '../../../types/tokens';
 import { ElementBinder } from '../types';
-import { SyntaxToken } from '../../../lexer/tokens';
-import { CompileError } from '../../../errors';
-import { default as SymbolFactory } from '../../symbol/factory';
 export default class DiagramViewBinder implements ElementBinder {
     private symbolFactory;
     private declarationNode;

package/dist/src/core/analyzer/binder/elementBinder/enum.d.ts

@@ -1,8 +1,8 @@
-import { CompileError } from '../../../errors';
+import { CompileError } from '../../../types/errors';
+import { default as SymbolFactory } from '../../../types/symbol/factory';
+import { ElementDeclarationNode, ProgramNode } from '../../../types/nodes';
+import { SyntaxToken } from '../../../types/tokens';
 import { ElementBinder } from '../types';
-import { ElementDeclarationNode, ProgramNode } from '../../../parser/nodes';
-import { SyntaxToken } from '../../../lexer/tokens';
-import { default as SymbolFactory } from '../../symbol/factory';
 export default class EnumBinder implements ElementBinder {
     private symbolFactory;
     private declarationNode;

package/dist/src/core/analyzer/binder/elementBinder/indexes.d.ts

@@ -1,8 +1,8 @@
-import { ElementDeclarationNode, ProgramNode } from '../../../parser/nodes';
+import { CompileError } from '../../../types/errors';
+import { default as SymbolFactory } from '../../../types/symbol/factory';
+import { ElementDeclarationNode, ProgramNode } from '../../../types/nodes';
+import { SyntaxToken } from '../../../types/tokens';
 import { ElementBinder } from '../types';
-import { SyntaxToken } from '../../../lexer/tokens';
-import { CompileError } from '../../../errors';
-import { default as SymbolFactory } from '../../symbol/factory';
 export default class IndexesBinder implements ElementBinder {
     private symbolFactory;
     private declarationNode;

package/dist/src/core/analyzer/binder/elementBinder/note.d.ts

@@ -1,8 +1,8 @@
-import { CompileError } from '../../../errors';
+import { CompileError } from '../../../types/errors';
+import { default as SymbolFactory } from '../../../types/symbol/factory';
+import { ElementDeclarationNode, ProgramNode } from '../../../types/nodes';
+import { SyntaxToken } from '../../../types/tokens';
 import { ElementBinder } from '../types';
-import { ElementDeclarationNode, ProgramNode } from '../../../parser/nodes';
-import { SyntaxToken } from '../../../lexer/tokens';
-import { default as SymbolFactory } from '../../symbol/factory';
 export default class NoteBinder implements ElementBinder {
     private symbolFactory;
     private declarationNode;

package/dist/src/core/analyzer/binder/elementBinder/project.d.ts

@@ -1,8 +1,8 @@
-import { SyntaxToken } from '../../../lexer/tokens';
+import { CompileError } from '../../../types/errors';
+import { default as SymbolFactory } from '../../../types/symbol/factory';
+import { ElementDeclarationNode, ProgramNode } from '../../../types/nodes';
+import { SyntaxToken } from '../../../types/tokens';
 import { ElementBinder } from '../types';
-import { ElementDeclarationNode, ProgramNode } from '../../../parser/nodes';
-import { CompileError } from '../../../errors';
-import { default as SymbolFactory } from '../../symbol/factory';
 export default class ProjectBinder implements ElementBinder {
     private symbolFactory;
     private declarationNode;

package/dist/src/core/analyzer/binder/elementBinder/records.d.ts

@@ -1,8 +1,8 @@
-import { SyntaxToken } from '../../../lexer/tokens';
+import { CompileError } from '../../../types/errors';
+import { default as SymbolFactory } from '../../../types/symbol/factory';
+import { ElementDeclarationNode, ProgramNode } from '../../../types/nodes';
+import { SyntaxToken } from '../../../types/tokens';
 import { ElementBinder } from '../types';
-import { ElementDeclarationNode, ProgramNode } from '../../../parser/nodes';
-import { CompileError } from '../../../errors';
-import { default as SymbolFactory } from '../../symbol/factory';
 export default class RecordsBinder implements ElementBinder {
     private symbolFactory;
     private declarationNode;

package/dist/src/core/analyzer/binder/elementBinder/ref.d.ts

@@ -1,8 +1,8 @@
-import { ElementDeclarationNode, ProgramNode } from '../../../parser/nodes';
+import { CompileError } from '../../../types/errors';
+import { default as SymbolFactory } from '../../../types/symbol/factory';
+import { ElementDeclarationNode, ProgramNode } from '../../../types/nodes';
+import { SyntaxToken } from '../../../types/tokens';
 import { ElementBinder } from '../types';
-import { SyntaxToken } from '../../../lexer/tokens';
-import { CompileError } from '../../../errors';
-import { default as SymbolFactory } from '../../symbol/factory';
 export default class RefBinder implements ElementBinder {
     private symbolFactory;
     private declarationNode;

package/dist/src/core/analyzer/binder/elementBinder/table.d.ts

@@ -1,8 +1,8 @@
-import { ElementDeclarationNode, ProgramNode } from '../../../parser/nodes';
+import { CompileError } from '../../../types/errors';
+import { default as SymbolFactory } from '../../../types/symbol/factory';
+import { ElementDeclarationNode, ProgramNode } from '../../../types/nodes';
+import { SyntaxToken } from '../../../types/tokens';
 import { ElementBinder } from '../types';
-import { SyntaxToken } from '../../../lexer/tokens';
-import { CompileError } from '../../../errors';
-import { default as SymbolFactory } from '../../symbol/factory';
 export default class TableBinder implements ElementBinder {
     private symbolFactory;
     private declarationNode;

package/dist/src/core/analyzer/binder/elementBinder/tableGroup.d.ts

@@ -1,8 +1,8 @@
-import { ElementDeclarationNode, ProgramNode } from '../../../parser/nodes';
+import { CompileError } from '../../../types/errors';
+import { default as SymbolFactory } from '../../../types/symbol/factory';
+import { ElementDeclarationNode, ProgramNode } from '../../../types/nodes';
+import { SyntaxToken } from '../../../types/tokens';
 import { ElementBinder } from '../types';
-import { SyntaxToken } from '../../../lexer/tokens';
-import { CompileError } from '../../../errors';
-import { default as SymbolFactory } from '../../symbol/factory';
 export default class TableGroupBinder implements ElementBinder {
     private symbolFactory;
     private declarationNode;

package/dist/src/core/analyzer/binder/elementBinder/tablePartial.d.ts

@@ -1,8 +1,8 @@
-import { ElementDeclarationNode, ProgramNode } from '../../../parser/nodes';
-import { SyntaxToken } from '../../../lexer/tokens';
+import { CompileError } from '../../../types/errors';
+import { default as SymbolFactory } from '../../../types/symbol/factory';
+import { ElementDeclarationNode, ProgramNode } from '../../../types/nodes';
+import { SyntaxToken } from '../../../types/tokens';
 import { ElementBinder } from '../types';
-import { CompileError } from '../../../errors';
-import { default as SymbolFactory } from '../../symbol/factory';
 export default class TablePartialBinder implements ElementBinder {
     private symbolFactory;
     private declarationNode;

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

@@ -1,4 +1,4 @@
-import { CompileError } from '../../errors';
+import { CompileError } from '../../types/errors';
 export interface ElementBinder {
     bind(): CompileError[];
 }

package/dist/src/core/analyzer/binder/utils.d.ts

@@ -1,5 +1,7 @@
-import { SyntaxToken } from '../../lexer/tokens';
-import { ElementDeclarationNode, PrimaryExpressionNode, ProgramNode, SyntaxNode, VariableNode } from '../../parser/nodes';
+import { CompileError } from '../../types/errors';
+import { ElementDeclarationNode, PrimaryExpressionNode, ProgramNode, SyntaxNode, VariableNode } from '../../types/nodes';
+import { SymbolKind } from '../../types/symbol';
+import { SyntaxToken } from '../../types/tokens';
 import { default as ChecksBinder } from './elementBinder/checks';
 import { default as CustomBinder } from './elementBinder/custom';
 import { default as DiagramViewBinder } from './elementBinder/diagramView';
@@ -7,13 +9,11 @@ import { default as EnumBinder } from './elementBinder/enum';
 import { default as IndexesBinder } from './elementBinder/indexes';
 import { default as NoteBinder } from './elementBinder/note';
 import { default as ProjectBinder } from './elementBinder/project';
+import { default as RecordsBinder } from './elementBinder/records';
 import { default as RefBinder } from './elementBinder/ref';
 import { default as TableBinder } from './elementBinder/table';
 import { default as TableGroupBinder } from './elementBinder/tableGroup';
 import { default as TablePartialBinder } from './elementBinder/tablePartial';
-import { SymbolKind } from '../symbol/symbolIndex';
-import { CompileError } from '../../errors';
-import { default as RecordsBinder } from './elementBinder/records';
 export declare function pickBinder(element: ElementDeclarationNode & {
     type: SyntaxToken;
 }): typeof ChecksBinder | typeof CustomBinder | typeof EnumBinder | typeof TableBinder | typeof TableGroupBinder | typeof ProjectBinder | typeof RefBinder | typeof NoteBinder | typeof IndexesBinder | typeof TablePartialBinder | typeof RecordsBinder | typeof DiagramViewBinder;

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

@@ -1,31 +1,28 @@
-import { Option } from '../option';
-import { ElementDeclarationNode, FunctionExpressionNode, InfixExpressionNode, PrimaryExpressionNode, SyntaxNode, VariableNode } from '../parser/nodes';
-import { SyntaxToken } from '../lexer/tokens';
-import { NodeSymbolIndex } from './symbol/symbolIndex';
-import { NodeSymbol } from './symbol/symbols';
-import { ElementKind } from './types';
-export declare function getElementKind(node?: ElementDeclarationNode): Option<ElementKind>;
-export declare function destructureMemberAccessExpression(node?: SyntaxNode): Option<SyntaxNode[]>;
-export declare function destructureComplexVariable(node?: SyntaxNode): Option<string[]>;
-export declare function destructureComplexVariableTuple(node?: SyntaxNode): Option<{
+import { ElementDeclarationNode, FunctionExpressionNode, InfixExpressionNode, PrimaryExpressionNode, SyntaxNode, VariableNode } from '../types/nodes';
+import { NodeSymbolIndex } from '../types/symbol';
+import { NodeSymbol } from '../types/symbol/symbols';
+import { SyntaxToken } from '../types/tokens';
+export declare function destructureMemberAccessExpression(node?: SyntaxNode): SyntaxNode[] | undefined;
+export declare function destructureComplexVariable(node?: SyntaxNode): string[] | undefined;
+export declare function destructureComplexVariableTuple(node?: SyntaxNode): {
     variables: (PrimaryExpressionNode & {
         expression: VariableNode;
     })[];
     tupleElements: (PrimaryExpressionNode & {
         expression: VariableNode;
     })[];
-}>;
-export declare function extractVariableFromExpression(node?: SyntaxNode): Option<string>;
-export declare function destructureIndexNode(node?: SyntaxNode): Option<{
+} | undefined;
+export declare function extractVariableFromExpression(node?: SyntaxNode): string | undefined;
+export declare function destructureIndexNode(node?: SyntaxNode): {
     functional: FunctionExpressionNode[];
     nonFunctional: (PrimaryExpressionNode & {
         expression: VariableNode;
     })[];
-}>;
+} | undefined;
 export declare function extractVarNameFromPrimaryVariable(node?: PrimaryExpressionNode & {
     expression: VariableNode;
-}): Option<string>;
-export declare function extractQuotedStringToken(value?: SyntaxNode): Option<string>;
+}): string | undefined;
+export declare function extractQuotedStringToken(value?: SyntaxNode): string | undefined;
 export declare function extractNumericLiteral(node?: SyntaxNode): number | null;
 export declare function extractReferee(node?: SyntaxNode): NodeSymbol | undefined;
 export declare function isBinaryRelationship(value?: SyntaxNode): value is InfixExpressionNode;
@@ -40,12 +37,12 @@ export declare function extractIndexName(value: (PrimaryExpressionNode & {
 }) | (FunctionExpressionNode & {
     value: SyntaxToken;
 })): string;
-export declare function destructureCallExpression(node?: SyntaxNode): Option<{
+export declare function destructureCallExpression(node?: SyntaxNode): {
     variables: (PrimaryExpressionNode & {
         expression: VariableNode;
     })[];
     args: (PrimaryExpressionNode & {
         expression: VariableNode;
     })[];
-}>;
+} | undefined;
 export declare function findSymbol(id: NodeSymbolIndex, startElement: ElementDeclarationNode): NodeSymbol | undefined;

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

@@ -1,9 +1,9 @@
-import { default as SymbolFactory } from '../../symbol/factory';
-import { CompileError, CompileWarning } from '../../../errors';
-import { ElementDeclarationNode } from '../../../parser/nodes';
-import { SyntaxToken } from '../../../lexer/tokens';
 import { ElementValidator } from '../types';
-import { default as SymbolTable } from '../../symbol/symbolTable';
+import { CompileError, CompileWarning } from '../../../types/errors';
+import { ElementDeclarationNode } from '../../../types/nodes';
+import { default as SymbolFactory } from '../../../types/symbol/factory';
+import { default as SymbolTable } from '../../../types/symbol/symbolTable';
+import { SyntaxToken } from '../../../types/tokens';
 export default class ChecksValidator implements ElementValidator {
     private declarationNode;
     private publicSymbolTable;

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

@@ -1,9 +1,9 @@
-import { CompileError, CompileWarning } from '../../../errors';
-import { BlockExpressionNode, ElementDeclarationNode, FunctionApplicationNode } from '../../../parser/nodes';
-import { default as SymbolFactory } from '../../symbol/factory';
-import { SyntaxToken } from '../../../lexer/tokens';
 import { ElementValidator } from '../types';
-import { default as SymbolTable } from '../../symbol/symbolTable';
+import { CompileError, CompileWarning } from '../../../types/errors';
+import { BlockExpressionNode, ElementDeclarationNode, FunctionApplicationNode } from '../../../types/nodes';
+import { default as SymbolFactory } from '../../../types/symbol/factory';
+import { default as SymbolTable } from '../../../types/symbol/symbolTable';
+import { SyntaxToken } from '../../../types/tokens';
 export default class CustomValidator implements ElementValidator {
     private declarationNode;
     private publicSymbolTable;

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

@@ -1,9 +1,9 @@
-import { CompileError, CompileWarning } from '../../../errors';
 import { ElementValidator } from '../types';
-import { default as SymbolTable } from '../../symbol/symbolTable';
-import { SyntaxToken } from '../../../lexer/tokens';
-import { BlockExpressionNode, ElementDeclarationNode, FunctionApplicationNode } from '../../../parser/nodes';
-import { default as SymbolFactory } from '../../symbol/factory';
+import { CompileError, CompileWarning } from '../../../types/errors';
+import { BlockExpressionNode, ElementDeclarationNode, FunctionApplicationNode } from '../../../types/nodes';
+import { default as SymbolFactory } from '../../../types/symbol/factory';
+import { default as SymbolTable } from '../../../types/symbol/symbolTable';
+import { SyntaxToken } from '../../../types/tokens';
 export default class DiagramViewValidator implements ElementValidator {
     private declarationNode;
     private publicSymbolTable;

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

@@ -1,9 +1,9 @@
-import { default as SymbolFactory } from '../../symbol/factory';
-import { CompileError, CompileWarning } from '../../../errors';
-import { BlockExpressionNode, ElementDeclarationNode, FunctionApplicationNode, ListExpressionNode } from '../../../parser/nodes';
-import { SyntaxToken } from '../../../lexer/tokens';
 import { ElementValidator } from '../types';
-import { default as SymbolTable } from '../../symbol/symbolTable';
+import { CompileError, CompileWarning } from '../../../types/errors';
+import { BlockExpressionNode, ElementDeclarationNode, FunctionApplicationNode, ListExpressionNode } from '../../../types/nodes';
+import { default as SymbolFactory } from '../../../types/symbol/factory';
+import { default as SymbolTable } from '../../../types/symbol/symbolTable';
+import { SyntaxToken } from '../../../types/tokens';
 export default class EnumValidator implements ElementValidator {
     private declarationNode;
     private publicSymbolTable;

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

@@ -1,9 +1,9 @@
-import { default as SymbolFactory } from '../../symbol/factory';
-import { CompileError, CompileWarning } from '../../../errors';
-import { ElementDeclarationNode, SyntaxNode } from '../../../parser/nodes';
-import { SyntaxToken } from '../../../lexer/tokens';
 import { ElementValidator } from '../types';
-import { default as SymbolTable } from '../../symbol/symbolTable';
+import { CompileError, CompileWarning } from '../../../types/errors';
+import { ElementDeclarationNode, SyntaxNode } from '../../../types/nodes';
+import { default as SymbolFactory } from '../../../types/symbol/factory';
+import { default as SymbolTable } from '../../../types/symbol/symbolTable';
+import { SyntaxToken } from '../../../types/tokens';
 export default class IndexesValidator implements ElementValidator {
     private declarationNode;
     private publicSymbolTable;

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

@@ -1,9 +1,9 @@
-import { default as SymbolFactory } from '../../symbol/factory';
-import { CompileError, CompileWarning } from '../../../errors';
-import { BlockExpressionNode, ElementDeclarationNode, FunctionApplicationNode } from '../../../parser/nodes';
-import { SyntaxToken } from '../../../lexer/tokens';
 import { ElementValidator } from '../types';
-import { default as SymbolTable } from '../../symbol/symbolTable';
+import { CompileError, CompileWarning } from '../../../types/errors';
+import { BlockExpressionNode, ElementDeclarationNode, FunctionApplicationNode } from '../../../types/nodes';
+import { default as SymbolFactory } from '../../../types/symbol/factory';
+import { default as SymbolTable } from '../../../types/symbol/symbolTable';
+import { SyntaxToken } from '../../../types/tokens';
 export default class NoteValidator implements ElementValidator {
     private declarationNode;
     private publicSymbolTable;

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

@@ -1,9 +1,9 @@
-import { default as SymbolFactory } from '../../symbol/factory';
-import { CompileError, CompileWarning } from '../../../errors';
-import { BlockExpressionNode, ElementDeclarationNode, FunctionApplicationNode } from '../../../parser/nodes';
-import { SyntaxToken } from '../../../lexer/tokens';
 import { ElementValidator } from '../types';
-import { default as SymbolTable } from '../../symbol/symbolTable';
+import { CompileError, CompileWarning } from '../../../types/errors';
+import { BlockExpressionNode, ElementDeclarationNode, FunctionApplicationNode } from '../../../types/nodes';
+import { default as SymbolFactory } from '../../../types/symbol/factory';
+import { default as SymbolTable } from '../../../types/symbol/symbolTable';
+import { SyntaxToken } from '../../../types/tokens';
 export default class ProjectValidator implements ElementValidator {
     private declarationNode;
     private publicSymbolTable;

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

@@ -1,9 +1,9 @@
-import { default as SymbolFactory } from '../../symbol/factory';
-import { CompileError, CompileWarning } from '../../../errors';
-import { BlockExpressionNode, ElementDeclarationNode, FunctionApplicationNode } from '../../../parser/nodes';
-import { SyntaxToken } from '../../../lexer/tokens';
 import { ElementValidator } from '../types';
-import { default as SymbolTable } from '../../symbol/symbolTable';
+import { CompileError, CompileWarning } from '../../../types/errors';
+import { BlockExpressionNode, ElementDeclarationNode, FunctionApplicationNode } from '../../../types/nodes';
+import { default as SymbolFactory } from '../../../types/symbol/factory';
+import { default as SymbolTable } from '../../../types/symbol/symbolTable';
+import { SyntaxToken } from '../../../types/tokens';
 export default class RecordsValidator implements ElementValidator {
     private declarationNode;
     private publicSymbolTable;