brighterscript 0.66.0-alpha.6 → 0.66.0-alpha.8

package/dist/interfaces.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { Range, Diagnostic, CodeAction, SemanticTokenTypes, SemanticTokenModifiers, Position, CompletionItem } from 'vscode-languageserver';
 import type { Scope } from './Scope';
 import type { BrsFile } from './files/BrsFile';
@@ -7,25 +8,37 @@ import type { TypedFunctionType } from './types/TypedFunctionType';
 import type { ParseMode } from './parser/Parser';
 import type { Program } from './Program';
 import type { ProgramBuilder } from './ProgramBuilder';
-import type { FunctionStatement } from './parser/Statement';
-import type { AstNode, Expression } from './parser/AstNode';
+import type { ClassStatement, ConstStatement, EnumStatement, FunctionStatement, NamespaceStatement } from './parser/Statement';
+import type { AstNode, Expression, Statement } from './parser/AstNode';
 import type { TranspileState } from './parser/TranspileState';
-import type { SourceMapGenerator, SourceNode } from 'source-map';
+import type { SourceNode } from 'source-map';
 import type { BscType } from './types/BscType';
-import type { AstEditor } from './astUtils/AstEditor';
-import type { Token } from './lexer/Token';
-import type { SymbolTypeFlag } from './SymbolTable';
+import type { Editor } from './astUtils/Editor';
+import type { Identifier, Token } from './lexer/Token';
+import type { File } from './files/File';
+import type { FileFactory } from './files/Factory';
+import type { LazyFileData } from './files/LazyFileData';
+import type { SymbolTable, SymbolTypeFlag } from './SymbolTable';
 import type { CallExpression } from './parser/Expression';
 export interface BsDiagnostic extends Diagnostic {
-    file: BscFile;
+    file: File;
     /**
      * A generic data container where additional details of the diagnostic can be stored. These are stripped out before being sent to a languageclient, and not printed to the console.
      */
     data?: any;
 }
-export declare type BscFile = BrsFile | XmlFile;
+export declare enum DiagnosticOrigin {
+    Program = "Program",
+    Scope = "Scope",
+    File = "File",
+    ASTSegment = "AstSegment"
+}
+export interface BsDiagnosticWithOrigin extends BsDiagnostic {
+    origin: DiagnosticOrigin;
+    astSegment?: AstNode;
+}
 export interface Callable {
-    file: BscFile;
+    file: File;
     name: string;
     /**
      * Is the callable declared as "sub". If falsey, assumed declared as "function"
@@ -103,12 +116,12 @@ export interface FileObj {
  */
 export interface FileReference {
     /**
-     * The pkgPath to the referenced file.
+     * The destPath for the referenced file.
      */
-    pkgPath: string;
+    destPath: string;
     text: string;
     /**
-     * The file that is doing the import. Note this is NOT the file the pkgPath points to.
+     * The file that is doing the import. Note this is NOT the file the destPath points to.
      */
     sourceFile: XmlFile | BrsFile;
     /**
@@ -119,14 +132,6 @@ export interface FileReference {
      */
     filePathRange?: Range;
 }
-export interface File {
-    /**
-     * The absolute path to the file, relative to the pkg
-     */
-    pkgPath: string;
-    srcPath: string;
-    getDiagnostics(): BsDiagnostic[];
-}
 export interface VariableDeclaration {
     name: string;
     getType: () => BscType;
@@ -160,7 +165,7 @@ export interface CallableContainer {
 }
 export declare type CallableContainerMap = Map<string, CallableContainer[]>;
 export interface CommentFlag {
-    file: BscFile;
+    file: File;
     /**
      * The location of the ignore comment.
      */
@@ -174,18 +179,42 @@ export interface CommentFlag {
 export declare type CompilerPluginFactory = () => CompilerPlugin;
 export interface CompilerPlugin {
     name: string;
+    /**
+     * Called before a new program is created
+     */
     beforeProgramCreate?: PluginHandler<BeforeProgramCreateEvent>;
+    /**
+     * Called after a new program is created
+     */
     afterProgramCreate?: PluginHandler<AfterProgramCreateEvent>;
-    beforePrepublish?: PluginHandler<BeforePrepublishEvent>;
-    afterPrepublish?: PluginHandler<AfterPrepublishEvent>;
-    beforePublish?: PluginHandler<BeforePublishEvent>;
-    afterPublish?: PluginHandler<AfterPublishEvent>;
+    /**
+     * Called before the program gets prepared for building
+     */
+    beforePrepareProgram?: PluginHandler<BeforePrepareProgramEvent>;
+    /**
+     * Called when the program gets prepared for building
+     */
+    prepareProgram?: PluginHandler<PrepareProgramEvent>;
+    /**
+     * Called after the program gets prepared for building
+     */
+    afterPrepareProgram?: PluginHandler<AfterPrepareProgramEvent>;
+    /**
+     * Called before the entire program is validated
+     */
     beforeProgramValidate?: PluginHandler<BeforeProgramValidateEvent>;
+    /**
+     * Called before the entire program is validated
+     */
+    onProgramValidate?: PluginHandler<OnProgramValidateEvent>;
+    /**
+     * Called after the program has been validated
+     */
     afterProgramValidate?: PluginHandler<AfterProgramValidateEvent>;
-    beforeProgramTranspile?: PluginHandler<BeforeProgramTranspileEvent>;
-    afterProgramTranspile?: PluginHandler<AfterProgramTranspileEvent>;
+    /**
+     * Called right before the program is disposed/destroyed
+     */
     beforeProgramDispose?: PluginHandler<BeforeProgramDisposeEvent>;
-    onGetCodeActions?: PluginHandler<OnGetCodeActionsEvent>;
     /**
      * Emitted before the program starts collecting completions
      */
@@ -210,15 +239,49 @@ export interface CompilerPlugin {
      * Called after the `provideHover` hook. Use this if you want to intercept or sanitize the hover data (even from other plugins) before it gets sent to the client.
      */
     afterProvideHover?: PluginHandler<AfterProvideHoverEvent>;
-    onGetSemanticTokens?: PluginHandler<OnGetSemanticTokensEvent>;
+    /**
+     * Called after a scope was created
+     */
     afterScopeCreate?: PluginHandler<AfterScopeCreateEvent>;
     beforeScopeDispose?: PluginHandler<BeforeScopeDisposeEvent>;
+    onScopeDispose?: PluginHandler<OnScopeDisposeEvent>;
     afterScopeDispose?: PluginHandler<AfterScopeDisposeEvent>;
     beforeScopeValidate?: PluginHandler<BeforeScopeValidateEvent>;
     onScopeValidate?: PluginHandler<OnScopeValidateEvent>;
     afterScopeValidate?: PluginHandler<BeforeScopeValidateEvent>;
-    beforeFileParse?: PluginHandler<BeforeFileParseEvent>;
-    afterFileParse?: PluginHandler<AfterFileParseEvent>;
+    onGetCodeActions?: PluginHandler<OnGetCodeActionsEvent>;
+    onGetSemanticTokens?: PluginHandler<OnGetSemanticTokensEvent>;
+    /**
+     * Called before plugins are asked to provide files to the program. (excludes virtual files produced by `provideFile` events).
+     * Call the `setFileData()` method to override the file contents.
+     */
+    beforeProvideFile?: PluginHandler<BeforeProvideFileEvent>;
+    /**
+     * Give plugins the opportunity to handle processing a file. (excludes virtual files produced by `provideFile` events)
+     */
+    provideFile?: PluginHandler<ProvideFileEvent>;
+    /**
+     * Called after a file was added to the program. (excludes virtual files produced by `provideFile` events)
+     */
+    afterProvideFile?: PluginHandler<AfterProvideFileEvent>;
+    /**
+     * Called before a file is added to the program.
+     * Includes physical files as well as any virtual files produced by `provideFile` events
+     */
+    beforeFileAdd?: PluginHandler<BeforeFileAddEvent>;
+    /**
+     * Called after a file has been added to the program.
+     * Includes physical files as well as any virtual files produced by `provideFile` events
+     */
+    afterFileAdd?: PluginHandler<AfterFileAddEvent>;
+    /**
+     * Called before a file is removed from the program. This includes physical and virtual files
+     */
+    beforeFileRemove?: PluginHandler<BeforeFileRemoveEvent>;
+    /**
+     * Called after a file has been removed from the program. This includes physical and virtual files
+     */
+    afterFileRemove?: PluginHandler<AfterFileRemoveEvent>;
     /**
      * Called before each file is validated
      */
@@ -231,61 +294,111 @@ export interface CompilerPlugin {
      * Called after each file is validated
      */
     afterFileValidate?: PluginHandler<AfterFileValidateEvent>;
-    beforeFileTranspile?: PluginHandler<BeforeFileTranspileEvent>;
-    afterFileTranspile?: PluginHandler<AfterFileTranspileEvent>;
-    beforeFileDispose?: PluginHandler<BeforeFileDisposeEvent>;
-    afterFileDispose?: PluginHandler<AfterFileDisposeEvent>;
+    /**
+     * Called right before the program builds (i.e. generates the code and puts it in the stagingDir
+     */
+    beforeBuildProgram?: PluginHandler<BeforeBuildProgramEvent>;
+    /**
+     * Called right after the program builds (i.e. generates the code and puts it in the stagingDir
+     */
+    afterBuildProgram?: PluginHandler<AfterBuildProgramEvent>;
+    /**
+     * Before preparing the file for building
+     */
+    beforePrepareFile?: PluginHandler<BeforePrepareFileEvent>;
+    /**
+     * Prepare the file for building
+     */
+    prepareFile?: PluginHandler<PrepareFileEvent>;
+    /**
+     * After preparing the file for building
+     */
+    afterPrepareFile?: PluginHandler<AfterPrepareFileEvent>;
+    /**
+     * Before the program turns all file objects into their final buffers
+     */
+    beforeSerializeProgram?: PluginHandler<BeforeSerializeProgramEvent>;
+    /**
+     * Emitted right at the start of the program turning all file objects into their final buffers
+     */
+    onSerializeProgram?: PluginHandler<OnSerializeProgramEvent>;
+    /**
+     * After the program turns all file objects into their final buffers
+     */
+    afterSerializeProgram?: PluginHandler<AfterSerializeProgramEvent>;
+    /**
+     * Before turning the file into its final contents
+     */
+    beforeSerializeFile?: PluginHandler<BeforeSerializeFileEvent>;
+    /**
+     * Turn the file into its final contents (i.e. transpile a bs file, compress a jpeg, etc)
+     */
+    serializeFile?: PluginHandler<SerializeFileEvent>;
+    /**
+     * After turning the file into its final contents
+     */
+    afterSerializeFile?: PluginHandler<AfterSerializeFileEvent>;
+    /**
+     * Called before any files are written
+     */
+    beforeWriteProgram?: PluginHandler<BeforeWriteProgramEvent>;
+    /**
+     * Called after all files are written
+     */
+    afterWriteProgram?: PluginHandler<AfterWriteProgramEvent>;
+    /**
+     * Before a file is written to disk. These are raw files that contain the final output. One `File` may produce several of these
+     */
+    beforeWriteFile?: PluginHandler<BeforeWriteFileEvent>;
+    /**
+     * Called when a file should be persisted (usually writing to storage). These are raw files that contain the final output. One `File` may produce several of these.
+     * When a plugin has handled a file, it should be pushed to the `handledFiles` set so future plugins don't write the file multiple times
+     */
+    writeFile?: PluginHandler<WriteFileEvent>;
+    /**
+     * Before a file is written to disk. These are raw files that contain the final output. One `File` may produce several of these
+     */
+    afterWriteFile?: PluginHandler<AfterWriteFileEvent>;
 }
 export declare type PluginHandler<T, R = void> = (event: T) => R;
-export interface BeforeProgramCreateEvent {
-    builder: ProgramBuilder;
-}
-export interface AfterProgramCreateEvent {
-    builder: ProgramBuilder;
+export interface OnGetCodeActionsEvent<TFile extends File = File> {
     program: Program;
+    file: TFile;
+    range: Range;
+    scopes: Scope[];
+    diagnostics: BsDiagnostic[];
+    codeActions: CodeAction[];
 }
-export interface BeforePrepublishEvent {
+export interface BeforeProgramCreateEvent {
     builder: ProgramBuilder;
-    program: Program;
-    files: FileObj[];
 }
-export declare type AfterPrepublishEvent = BeforePrepublishEvent;
-export interface BeforePublishEvent {
+export interface AfterProgramCreateEvent {
     builder: ProgramBuilder;
     program: Program;
-    files: FileObj[];
 }
-export declare type AfterPublishEvent = BeforePublishEvent;
 export interface BeforeProgramValidateEvent {
     program: Program;
 }
+export declare type OnProgramValidateEvent = BeforeProgramValidateEvent;
 export declare type AfterProgramValidateEvent = BeforeProgramValidateEvent;
-export interface BeforeProgramTranspileEvent {
-    program: Program;
-    entries: TranspileEntry[];
-    editor: AstEditor;
-}
-export declare type AfterProgramTranspileEvent = BeforeProgramTranspileEvent;
-export interface OnGetCodeActionsEvent {
-    program: Program;
-    file: BscFile;
-    range: Range;
-    scopes: Scope[];
-    diagnostics: BsDiagnostic[];
-    codeActions: CodeAction[];
-}
-export interface ProvideCompletionsEvent<TFile extends BscFile = BscFile> {
+export interface ProvideCompletionsEvent<TFile extends File = File> {
     program: Program;
     file: TFile;
     scopes: Scope[];
     position: Position;
     completions: CompletionItem[];
 }
-export declare type BeforeProvideCompletionsEvent<TFile extends BscFile = BscFile> = ProvideCompletionsEvent<TFile>;
-export declare type AfterProvideCompletionsEvent<TFile extends BscFile = BscFile> = ProvideCompletionsEvent<TFile>;
+export declare type BeforeProvideCompletionsEvent<TFile extends File = File> = ProvideCompletionsEvent<TFile>;
+export declare type AfterProvideCompletionsEvent<TFile extends File = File> = ProvideCompletionsEvent<TFile>;
+export interface BeforeBuildProgramEvent {
+    program: Program;
+    files: File[];
+    editor: Editor;
+}
+export declare type AfterBuildProgramEvent = BeforeBuildProgramEvent;
 export interface ProvideHoverEvent {
     program: Program;
-    file: BscFile;
+    file: File;
     position: Position;
     scopes: Scope[];
     hovers: Hover[];
@@ -315,6 +428,10 @@ export interface BeforeScopeDisposeEvent {
     program: Program;
     scope: Scope;
 }
+export interface OnScopeDisposeEvent {
+    program: Program;
+    scope: Scope;
+}
 export interface AfterScopeDisposeEvent {
     program: Program;
     scope: Scope;
@@ -329,11 +446,16 @@ export interface BeforeFileParseEvent {
     srcPath: string;
     source: string;
 }
+export interface OnFileParseEvent {
+    program: Program;
+    srcPath: string;
+    source: string;
+}
 export interface AfterFileParseEvent {
     program: Program;
-    file: BscFile;
+    file: File;
 }
-export interface OnGetSemanticTokensEvent<T extends BscFile = BscFile> {
+export interface OnGetSemanticTokensEvent<T extends File = File> {
     /**
      * The program this file is from
      */
@@ -352,32 +474,31 @@ export interface OnGetSemanticTokensEvent<T extends BscFile = BscFile> {
     semanticTokens: SemanticToken[];
 }
 export declare type BeforeFileValidateEvent = OnFileValidateEvent;
-export interface OnFileValidateEvent<T extends BscFile = BscFile> {
+export interface OnFileValidateEvent<T extends File = File> {
     program: Program;
     file: T;
 }
 export declare type AfterFileValidateEvent = OnFileValidateEvent;
+export interface OnFileValidateEvent<T extends File = File> {
+    program: Program;
+    file: T;
+}
 export interface TranspileEntry {
-    file: BscFile;
+    file: File;
     outputPath: string;
 }
+export interface ScopeValidationOptions {
+    changedFiles?: File[];
+    changedSymbols?: Map<SymbolTypeFlag, Set<string>>;
+    force?: boolean;
+}
 export interface OnScopeValidateEvent {
     program: Program;
     scope: Scope;
+    changedFiles?: File[];
+    changedSymbols?: Map<SymbolTypeFlag, Set<string>>;
 }
-export declare type Editor = Pick<AstEditor, 'addToArray' | 'hasChanges' | 'removeFromArray' | 'setArrayValue' | 'setProperty' | 'overrideTranspileResult' | 'arrayPop' | 'arrayPush' | 'arrayShift' | 'arraySplice' | 'arrayUnshift' | 'removeProperty' | 'edit'>;
-export interface BeforeFileTranspileEvent<TFile extends BscFile = BscFile> {
-    program: Program;
-    file: TFile;
-    outputPath: string;
-    /**
-     * An editor that can be used to transform properties or arrays. Once the `afterFileTranspile` event has fired, these changes will be reverted,
-     * restoring the objects to their prior state. This is useful for changing code right before a file gets transpiled, but when you don't want
-     * the changes to persist in the in-memory file.
-     */
-    editor: Editor;
-}
-export interface AfterFileTranspileEvent<TFile extends BscFile = BscFile> {
+export interface AfterFileTranspileEvent<TFile extends File = File> {
     /**
      * The program this event was triggered for
      */
@@ -391,21 +512,145 @@ export interface AfterFileTranspileEvent<TFile extends BscFile = BscFile> {
     /**
      * The sourceMaps for the generated code (if emitting source maps is enabled)
      */
-    map?: SourceMapGenerator;
+    map?: string;
     /**
      * The generated type definition file contents (if emitting type definitions are enabled)
      */
     typedef?: string;
+}
+export declare type BeforeProvideFileEvent<TFile extends File = File> = ProvideFileEvent<TFile>;
+export interface ProvideFileEvent<TFile extends File = File> {
+    /**
+     * The lower-case file extension for the srcPath. (i.e. ".brs", ".xml")
+     */
+    srcExtension: string;
+    /**
+     * The srcPath for the file. (i.e. `/user/bob/projects/VideoApp/source/main.bs`)
+     */
+    srcPath: string;
+    /**
+     * The destPath for the file. (i.e. for `/user/bob/projects/VideoApp/source/main.bs`, destPath would be `source/main.bs`)
+     */
+    destPath: string;
+    /**
+     * A lazy-loading container for this file's data. Call `.get()` to lazy load the data, and `.set()` to override file contents
+     */
+    data: LazyFileData;
+    /**
+     * An array of files that should be added to the program as a result of this event
+     */
+    files: TFile[];
+    /**
+     * The program for this event
+     */
+    program: Program;
     /**
-     * An editor that can be used to transform properties or arrays. Once the `afterFileTranspile` event has fired, these changes will be reverted,
-     * restoring the objects to their prior state. This is useful for changing code right before a file gets transpiled, but when you don't want
-     * the changes to persist in the in-memory file.
+     * A factory used to create new instances of the BrighterScript built-in file types. This mitigates the issue
+     * of a plugin's version of a File not being the same as the LanguageServer or CLI version of BrighterScript
+     * (due to npm installing multiple versions of brighterscript)
      */
+    fileFactory: FileFactory;
+}
+export declare type AfterProvideFileEvent<TFile extends File = File> = ProvideFileEvent<TFile>;
+export interface BeforeFileAddEvent<TFile extends File = File> {
+    file: TFile;
+    program: Program;
+}
+export declare type AfterFileAddEvent<TFile extends File = File> = BeforeFileAddEvent<TFile>;
+export interface BeforeFileRemoveEvent<TFile extends File = File> {
+    file: TFile;
+    program: Program;
+}
+export declare type AfterFileRemoveEvent<TFile extends File = File> = BeforeFileRemoveEvent<TFile>;
+export declare type BeforePrepareProgramEvent = PrepareProgramEvent;
+/**
+ * Event for when the program prepares itself for building
+ */
+export interface PrepareProgramEvent {
+    program: Program;
+    editor: Editor;
+}
+export declare type AfterPrepareProgramEvent = PrepareProgramEvent;
+export declare type BeforePrepareFileEvent<TFile extends File = File> = PrepareFileEvent<TFile>;
+/**
+ * Prepare the file for building
+ */
+export interface PrepareFileEvent<TFile extends File = File> {
+    program: Program;
+    file: TFile;
     editor: Editor;
 }
+export declare type OnPrepareFileEvent<TFile extends File = File> = PrepareFileEvent<TFile>;
+export declare type AfterPrepareFileEvent<TFile extends File = File> = PrepareFileEvent<TFile>;
+/**
+ * A container that holds the code, map, and typedef for serialized code files.
+ */
+export interface SerializedCodeFile {
+    code?: string;
+    map?: string;
+    typedef?: string;
+}
+export interface BeforeSerializeProgramEvent {
+    program: Program;
+    files: File[];
+    result: Map<File, SerializedFile[]>;
+}
+export declare type OnSerializeProgramEvent = BeforeSerializeProgramEvent;
+export declare type AfterSerializeProgramEvent = BeforeSerializeProgramEvent;
+/**
+ * During the `SerializeFile` events, this is how plugins will contribute file data for a specific file
+ */
+export interface SerializedFile {
+    /**
+     * The raw data for this file (i.e. a binary buffer for a .jpeg file, or the transpiled code for a .bs file)
+     */
+    data: Buffer;
+    /**
+     * The pkgPath for this chunk of data.
+     */
+    pkgPath: string;
+}
+export declare type BeforeSerializeFileEvent<TFile extends File = File> = SerializeFileEvent<TFile>;
+export interface SerializeFileEvent<TFile extends File = File> {
+    program: Program;
+    file: TFile;
+    /**
+     * The list of all files created across all the `SerializeFile` events.
+     * The key is the pkgPath of the file, and the
+     */
+    result: Map<TFile, SerializedFile[]>;
+}
+export declare type AfterSerializeFileEvent<TFile extends File = File> = SerializeFileEvent<TFile>;
+export interface BeforeWriteProgramEvent {
+    program: Program;
+    stagingDir: string;
+    files: Map<File, SerializedFile[]>;
+}
+export declare type AfterWriteProgramEvent = BeforeWriteProgramEvent;
+export declare type BeforeWriteFileEvent = WriteFileEvent;
+export interface WriteFileEvent {
+    program: Program;
+    file: SerializedFile;
+    /**
+     * The full path to where the file was (or will be) written to.
+     */
+    outputPath: string;
+    /**
+     * A set of all files that have been properly written. Plugins should add any handled files to this list so future plugins don't write then again
+     */
+    processedFiles: Set<SerializedFile>;
+}
+export declare type AfterWriteFileEvent = BeforeWriteFileEvent;
+export interface TranspileObj {
+    file: File;
+    /**
+     * The absolute path to where the file should be written during build. (i.e. somewhere inside the stagingDir)
+     */
+    outputPath: string;
+}
 export interface BeforeFileDisposeEvent {
     program: Program;
-    file: BscFile;
+    file: File;
 }
 export declare type AfterFileDisposeEvent = BeforeFileDisposeEvent;
 export interface BeforeProgramDisposeEvent {
@@ -423,7 +668,7 @@ export interface TypedefProvider {
     getTypedef(state: TranspileState): Array<SourceNode | string>;
 }
 export declare type TranspileResult = Array<(string | SourceNode)>;
-export declare type FileResolver = (srcPath: string) => string | undefined | Thenable<string | undefined> | void;
+export declare type FileResolver = (srcPath: string) => string | Buffer | undefined | Thenable<string | Buffer | undefined> | void;
 export interface ExpressionInfo {
     expressions: Expression[];
     varExpressions: Expression[];
@@ -438,19 +683,22 @@ export interface ExtraSymbolData {
     definingNode?: AstNode;
     description?: string;
     completionPriority?: number;
+    flags?: SymbolTypeFlag;
 }
 export interface GetTypeOptions {
     flags: SymbolTypeFlag;
     typeChain?: TypeChainEntry[];
     data?: ExtraSymbolData;
     ignoreCall?: boolean;
+    onlyCacheResolvedTypes?: boolean;
 }
 export declare class TypeChainEntry {
     name: string;
     type: BscType;
+    flags: SymbolTypeFlag;
     range: Range;
     separatorToken: Token;
-    constructor(name: string, type: BscType, range: Range, separatorToken?: Token);
+    constructor(name: string, type: BscType, flags: SymbolTypeFlag, range: Range, separatorToken?: Token);
     get isResolved(): boolean;
 }
 export interface TypeChainProcessResult {
@@ -471,4 +719,24 @@ export interface TypeCompatibilityData {
         expectedType: BscType;
         actualType: BscType;
     }[];
+    depth?: number;
+}
+export interface NamespaceContainer {
+    file: File;
+    fullName: string;
+    fullNameLower: string;
+    parentNameLower: string;
+    nameParts: Identifier[];
+    nameRange: Range;
+    lastPartName: string;
+    lastPartNameLower: string;
+    functionStatements: Map<string, FunctionStatement>;
+    isTopLevel: boolean;
+    namespaceStatements?: NamespaceStatement[];
+    statements?: Statement[];
+    classStatements?: Map<string, ClassStatement>;
+    enumStatements?: Map<string, EnumStatement>;
+    constStatements?: Map<string, ConstStatement>;
+    namespaces?: Map<string, NamespaceContainer>;
+    symbolTable: SymbolTable;
 }

package/dist/interfaces.js

@@ -1,12 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypeChainEntry = void 0;
+exports.TypeChainEntry = exports.DiagnosticOrigin = void 0;
 const creators_1 = require("./astUtils/creators");
 const TokenKind_1 = require("./lexer/TokenKind");
+var DiagnosticOrigin;
+(function (DiagnosticOrigin) {
+    DiagnosticOrigin["Program"] = "Program";
+    DiagnosticOrigin["Scope"] = "Scope";
+    DiagnosticOrigin["File"] = "File";
+    DiagnosticOrigin["ASTSegment"] = "AstSegment";
+})(DiagnosticOrigin = exports.DiagnosticOrigin || (exports.DiagnosticOrigin = {}));
 class TypeChainEntry {
-    constructor(name, type, range, separatorToken = (0, creators_1.createToken)(TokenKind_1.TokenKind.Dot)) {
+    constructor(name, type, flags, range, separatorToken = (0, creators_1.createToken)(TokenKind_1.TokenKind.Dot)) {
         this.name = name;
         this.type = type;
+        this.flags = flags;
         this.range = range;
         this.separatorToken = separatorToken;
     }

package/dist/interfaces.js.map

@@ -1 +1 @@
-{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":";;;AAkBA,kDAAkD;AAClD,iDAA8C;AA6d9C,MAAa,cAAc;IACvB,YAAmB,IAAY,EAAS,IAAa,EAAS,KAAY,EAAS,iBAAwB,IAAA,sBAAW,EAAC,qBAAS,CAAC,GAAG,CAAC;QAAlH,SAAI,GAAJ,IAAI,CAAQ;QAAS,SAAI,GAAJ,IAAI,CAAS;QAAS,UAAK,GAAL,KAAK,CAAO;QAAS,mBAAc,GAAd,cAAc,CAAoC;IACrI,CAAC;IACD,IAAI,UAAU;;QACV,OAAO,MAAA,IAAI,CAAC,IAAI,0CAAE,YAAY,EAAE,CAAC;IACrC,CAAC;CACJ;AAND,wCAMC"}
+{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":";;;AAqBA,kDAAkD;AAClD,iDAA8C;AAU9C,IAAY,gBAKX;AALD,WAAY,gBAAgB;IACxB,uCAAmB,CAAA;IACnB,mCAAe,CAAA;IACf,iCAAa,CAAA;IACb,6CAAyB,CAAA;AAC7B,CAAC,EALW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAK3B;AA6uBD,MAAa,cAAc;IACvB,YAAmB,IAAY,EAAS,IAAa,EAAS,KAAqB,EAAS,KAAY,EAAS,iBAAwB,IAAA,sBAAW,EAAC,qBAAS,CAAC,GAAG,CAAC;QAAhJ,SAAI,GAAJ,IAAI,CAAQ;QAAS,SAAI,GAAJ,IAAI,CAAS;QAAS,UAAK,GAAL,KAAK,CAAgB;QAAS,UAAK,GAAL,KAAK,CAAO;QAAS,mBAAc,GAAd,cAAc,CAAoC;IACnK,CAAC;IACD,IAAI,UAAU;;QACV,OAAO,MAAA,IAAI,CAAC,IAAI,0CAAE,YAAY,EAAE,CAAC;IACrC,CAAC;CACJ;AAND,wCAMC"}

package/dist/lexer/Lexer.js

@@ -348,7 +348,7 @@ class Lexer {
                     this.scanToken();
                 }
                 if (this.check('}')) {
-                    this.current++;
+                    this.advance();
                     this.addToken(TokenKind_1.TokenKind.TemplateStringExpressionEnd);
                 }
                 else {

package/dist/lexer/TokenKind.d.ts

@@ -129,6 +129,7 @@ export declare enum TokenKind {
     Public = "Public",
     Protected = "Protected",
     Private = "Private",
+    Optional = "Optional",
     As = "As",
     New = "New",
     Override = "Override",