Remove nested index files (#492)

* Don't import from `..` folders

* Remove export barrels, instead import directly

src/Program.spec.ts

@@ -15,8 +15,10 @@ import { EmptyStatement } from './parser/Statement';
 import { expectDiagnostics, expectHasDiagnostics, expectZeroDiagnostics, trim, trimMap } from './testHelpers.spec';
 import { doesNotThrow } from 'assert';
 import { Logger } from './Logger';
-import { createToken, createVisitor, isBrsFile, WalkMode } from './astUtils';
-import { TokenKind } from './lexer';
+import { createToken } from './astUtils/creators';
+import { createVisitor, WalkMode } from './astUtils/visitors';
+import { isBrsFile } from './astUtils/reflection';
+import { TokenKind } from './lexer/TokenKind';
 import type { LiteralExpression } from './parser/Expression';
 
 let sinon = sinonImport.createSandbox();

src/Program.ts

@@ -22,8 +22,8 @@ import { URI } from 'vscode-uri';
 import PluginInterface from './PluginInterface';
 import { isBrsFile, isXmlFile, isClassMethodStatement, isXmlScope } from './astUtils/reflection';
 import type { FunctionStatement, Statement } from './parser/Statement';
-import { ParseMode } from './parser';
-import { TokenKind } from './lexer';
+import { ParseMode } from './parser/Parser';
+import { TokenKind } from './lexer/TokenKind';
 import { BscPlugin } from './bscPlugin/BscPlugin';
 import { AstEditor } from './astUtils/AstEditor';
 const startOfSourcePkgPath = `source${path.sep}`;

src/ProgramBuilder.spec.ts

@@ -9,7 +9,7 @@ import { Logger, LogLevel } from './Logger';
 import * as diagnosticUtils from './diagnosticUtils';
 import type { BscFile, BsDiagnostic } from '.';
 import { Range } from '.';
-import { DiagnosticSeverity } from './astUtils';
+import { DiagnosticSeverity } from 'vscode-languageserver';
 import { BrsFile } from './files/BrsFile';
 import { expectZeroDiagnostics } from './testHelpers.spec';
 

src/Scope.spec.ts

@@ -9,7 +9,7 @@ import PluginInterface from './PluginInterface';
 import { expectDiagnostics, expectZeroDiagnostics, trim } from './testHelpers.spec';
 import { Logger } from './Logger';
 import type { BrsFile } from './files/BrsFile';
-import type { FunctionStatement, NamespaceStatement } from './parser';
+import type { FunctionStatement, NamespaceStatement } from './parser/Statement';
 
 describe('Scope', () => {
     let sinon = sinonImport.createSandbox();

src/Scope.ts

@@ -7,8 +7,9 @@ import { DiagnosticMessages } from './DiagnosticMessages';
 import type { CallableContainer, BsDiagnostic, FileReference, BscFile, CallableContainerMap } from './interfaces';
 import type { FileLink, Program } from './Program';
 import { BsClassValidator } from './validators/ClassValidator';
-import type { NamespaceStatement, Statement, NewExpression, FunctionStatement, ClassStatement } from './parser';
-import { ParseMode } from './parser';
+import type { NamespaceStatement, Statement, FunctionStatement, ClassStatement } from './parser/Statement';
+import type { NewExpression } from './parser/Expression';
+import { ParseMode } from './parser/Parser';
 import { standardizePath as s, util } from './util';
 import { globalCallableMap } from './globalCallables';
 import { Cache } from './Cache';

src/astUtils/reflection.spec.ts

@@ -2,8 +2,8 @@
 import { expect } from 'chai';
 import { PrintStatement, Block, Body, AssignmentStatement, CommentStatement, ExitForStatement, ExitWhileStatement, ExpressionStatement, FunctionStatement, IfStatement, IncrementStatement, GotoStatement, LabelStatement, ReturnStatement, EndStatement, StopStatement, ForStatement, ForEachStatement, WhileStatement, DottedSetStatement, IndexedSetStatement, LibraryStatement, NamespaceStatement, ImportStatement, ClassStatement, EmptyStatement } from '../parser/Statement';
 import { FunctionExpression, NamespacedVariableNameExpression, BinaryExpression, CallExpression, DottedGetExpression, IndexedGetExpression, GroupingExpression, EscapedCharCodeLiteralExpression, ArrayLiteralExpression, AALiteralExpression, UnaryExpression, VariableExpression, SourceLiteralExpression, NewExpression, CallfuncExpression, TemplateStringQuasiExpression, XmlAttributeGetExpression, TemplateStringExpression, TaggedTemplateStringExpression, AnnotationExpression } from '../parser/Expression';
-import type { Token } from '../lexer';
-import { TokenKind } from '../lexer';
+import type { Token } from '../lexer/Token';
+import { TokenKind } from '../lexer/TokenKind';
 import { isPrintStatement, isIfStatement, isBody, isAssignmentStatement, isBlock, isExpressionStatement, isCommentStatement, isExitForStatement, isExitWhileStatement, isFunctionStatement, isIncrementStatement, isGotoStatement, isLabelStatement, isReturnStatement, isEndStatement, isStopStatement, isForStatement, isForEachStatement, isWhileStatement, isDottedSetStatement, isIndexedSetStatement, isLibraryStatement, isNamespaceStatement, isImportStatement, isExpression, isBinaryExpression, isCallExpression, isFunctionExpression, isNamespacedVariableNameExpression, isDottedGetExpression, isXmlAttributeGetExpression, isIndexedGetExpression, isGroupingExpression, isLiteralExpression, isEscapedCharCodeLiteralExpression, isArrayLiteralExpression, isAALiteralExpression, isUnaryExpression, isVariableExpression, isSourceLiteralExpression, isNewExpression, isCallfuncExpression, isTemplateStringQuasiExpression, isTemplateStringExpression, isTaggedTemplateStringExpression, isBrsFile, isXmlFile, isClassStatement, isStatement, isAnnotationExpression } from './reflection';
 import { createToken, createStringLiteral, createIdentifier, interpolatedRange as range } from './creators';
 import { Program } from '../Program';

src/astUtils/visitors.spec.ts

@@ -8,7 +8,7 @@ import { BrsFile } from '../files/BrsFile';
 import type { Statement } from '../parser/Statement';
 import { PrintStatement, Block, ReturnStatement } from '../parser/Statement';
 import type { Expression } from '../parser/Expression';
-import { TokenKind } from '../lexer';
+import { TokenKind } from '../lexer/TokenKind';
 import { createVisitor, WalkMode, walkStatements } from './visitors';
 import { isPrintStatement } from './reflection';
 import { createToken } from './creators';

src/bscPlugin/codeActions/CodeActionsProcessor.ts

@@ -6,7 +6,7 @@ import { DiagnosticCodeMap } from '../../DiagnosticMessages';
 import type { BrsFile } from '../../files/BrsFile';
 import type { XmlFile } from '../../files/XmlFile';
 import type { BscFile, OnGetCodeActionsEvent } from '../../interfaces';
-import { ParseMode } from '../../parser';
+import { ParseMode } from '../../parser/Parser';
 import { util } from '../../util';
 
 export class CodeActionsProcessor {

src/bscPlugin/semanticTokens/SemanticTokensProcessor.ts

@@ -3,7 +3,7 @@ import { SemanticTokenTypes } from 'vscode-languageserver-protocol';
 import { isBrsFile, isCustomType } from '../../astUtils/reflection';
 import type { BrsFile } from '../../files/BrsFile';
 import type { OnGetSemanticTokensEvent } from '../../interfaces';
-import { ParseMode } from '../../parser';
+import { ParseMode } from '../../parser/Parser';
 import util from '../../util';
 
 export class SemanticTokensProcessor {

src/files/BrsFile.spec.ts

@@ -11,7 +11,8 @@ import { IntegerType } from '../types/IntegerType';
 import { StringType } from '../types/StringType';
 import { BrsFile } from './BrsFile';
 import { SourceMapConsumer } from 'source-map';
-import { TokenKind, Lexer, Keywords } from '../lexer';
+import { Lexer } from '../lexer/Lexer';
+import { TokenKind, Keywords } from '../lexer/TokenKind';
 import { DiagnosticMessages } from '../DiagnosticMessages';
 import type { StandardizedFileEntry } from 'roku-deploy';
 import util, { standardizePath as s } from '../util';

src/files/BrsFile.ts

@@ -8,9 +8,10 @@ import type { Scope } from '../Scope';
 import { DiagnosticCodeMap, diagnosticCodes, DiagnosticMessages } from '../DiagnosticMessages';
 import { FunctionScope } from '../FunctionScope';
 import type { Callable, CallableArg, CallableParam, CommentFlag, FunctionCall, BsDiagnostic, FileReference } from '../interfaces';
-import type { Token } from '../lexer';
-import { Lexer, TokenKind, AllowedLocalIdentifiers, Keywords } from '../lexer';
-import { Parser, ParseMode } from '../parser';
+import type { Token } from '../lexer/Token';
+import { Lexer } from '../lexer/Lexer';
+import { TokenKind, AllowedLocalIdentifiers, Keywords } from '../lexer/TokenKind';
+import { Parser, ParseMode } from '../parser/Parser';
 import type { FunctionExpression, VariableExpression, Expression } from '../parser/Expression';
 import type { ClassStatement, FunctionStatement, NamespaceStatement, ClassMethodStatement, AssignmentStatement, LibraryStatement, ImportStatement, Statement, ClassFieldStatement } from '../parser/Statement';
 import type { FileLink, Program, SignatureInfoObj } from '../Program';

src/index.ts

@@ -8,8 +8,18 @@ export { Watcher } from './Watcher';
 export * from './interfaces';
 export * from './LanguageServer';
 export * from './XmlScope';
-export * from './lexer';
-export * from './parser';
+export * from './lexer/TokenKind';
+export * from './lexer/Token';
+export { Lexer } from './lexer/Lexer';
+export * from './parser/Parser';
+export * from './parser/Expression';
+export * from './parser/Statement';
 export * from './BsConfig';
 export * from './deferred';
-export * from './astUtils';
+// convenience re-export from vscode
+export { Range, Position, CancellationToken, CancellationTokenSource, DiagnosticSeverity, DiagnosticTag } from 'vscode-languageserver';
+export * from './astUtils/visitors';
+export * from './astUtils/stackedVisitor';
+export * from './astUtils/reflection';
+export * from './astUtils/creators';
+export * from './astUtils/xml';

src/interfaces.ts

@@ -7,7 +7,8 @@ import type { FunctionType } from './types/FunctionType';
 import type { ParseMode } from './parser/Parser';
 import type { Program, SourceObj, TranspileObj } from './Program';
 import type { ProgramBuilder } from './ProgramBuilder';
-import type { Expression, FunctionStatement } from './parser';
+import type { FunctionStatement } from './parser/Statement';
+import type { Expression } from './parser/Expression';
 import type { TranspileState } from './parser/TranspileState';
 import type { SourceNode } from 'source-map';
 import type { BscType } from './types/BscType';

src/lexer/Lexer.spec.ts

@@ -1,7 +1,7 @@
 /* eslint no-template-curly-in-string: 0 */
 import { expect } from 'chai';
 
-import { TokenKind } from '.';
+import { TokenKind } from './TokenKind';
 import { Lexer } from './Lexer';
 import { isToken } from './Token';
 import { rangeToArray } from '../parser/Parser.spec';

src/lexer/Lexer.ts

@@ -1,11 +1,10 @@
 /* eslint-disable func-names */
-import { TokenKind, ReservedWords, Keywords } from './TokenKind';
+import { TokenKind, ReservedWords, Keywords, PreceedingRegexTypes } from './TokenKind';
 import type { Token } from './Token';
 import { isAlpha, isDecimalDigit, isAlphaNumeric, isHexDigit } from './Characters';
 import type { Range, Diagnostic } from 'vscode-languageserver';
 import { DiagnosticMessages } from '../DiagnosticMessages';
 import util from '../util';
-import { PreceedingRegexTypes } from '.';
 
 export class Lexer {
     /**

src/parser/Expression.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-bitwise */
-import type { Token, Identifier } from '../lexer';
-import { TokenKind } from '../lexer';
+import type { Token, Identifier } from '../lexer/Token';
+import { TokenKind } from '../lexer/TokenKind';
 import type { Block, CommentStatement, FunctionStatement } from './Statement';
 import type { Range } from 'vscode-languageserver';
 import util from '../util';

src/parser/Parser.Class.spec.ts

@@ -1,6 +1,7 @@
 import { expect } from 'chai';
 import { DiagnosticMessages } from '../DiagnosticMessages';
-import { TokenKind, Lexer, AllowedLocalIdentifiers, AllowedProperties } from '../lexer';
+import { TokenKind, AllowedLocalIdentifiers, AllowedProperties } from '../lexer/TokenKind';
+import { Lexer } from '../lexer/Lexer';
 import { Parser, ParseMode } from './Parser';
 import type { FunctionStatement, AssignmentStatement, ClassFieldStatement } from './Statement';
 import { ClassStatement } from './Statement';

src/parser/Parser.spec.ts

@@ -1,13 +1,14 @@
 import { expect, assert } from 'chai';
-import { Lexer, ReservedWords } from '../lexer';
+import { Lexer } from '../lexer/Lexer';
+import { ReservedWords } from '../lexer/TokenKind';
 import type { Expression } from './Expression';
 import { DottedGetExpression, XmlAttributeGetExpression, CallfuncExpression, AnnotationExpression, CallExpression, FunctionExpression } from './Expression';
 import { Parser, ParseMode } from './Parser';
 import type { AssignmentStatement, ClassStatement, Statement } from './Statement';
 import { PrintStatement, FunctionStatement, NamespaceStatement, ImportStatement } from './Statement';
 import { Range } from 'vscode-languageserver';
 import { DiagnosticMessages } from '../DiagnosticMessages';
-import { isBlock, isCommentStatement, isFunctionStatement, isIfStatement } from '../astUtils';
+import { isBlock, isCommentStatement, isFunctionStatement, isIfStatement } from '../astUtils/reflection';
 import { expectZeroDiagnostics } from '../testHelpers.spec';
 import { BrsTranspileState } from './BrsTranspileState';
 import { SourceNode } from 'source-map';

src/parser/Parser.ts

@@ -1,21 +1,16 @@
-import type {
-    Token,
-    Identifier,
-    BlockTerminator
-} from '../lexer';
+import type { Token, Identifier } from '../lexer/Token';
+import { isToken } from '../lexer/Token';
+import type { BlockTerminator } from '../lexer/TokenKind';
+import { Lexer } from '../lexer/Lexer';
 import {
-    TokenKind,
     AllowedLocalIdentifiers,
     AssignmentOperators,
     DisallowedLocalIdentifiersText,
     DisallowedFunctionIdentifiersText,
     AllowedProperties,
-    Lexer,
     BrighterScriptSourceLiterals,
-    isToken,
-    DeclarableTypes
-} from '../lexer';
-
+    DeclarableTypes, TokenKind
+} from '../lexer/TokenKind';
 import type {
     Statement,
     PrintSeparatorTab,
@@ -59,7 +54,6 @@ import {
 import type { DiagnosticInfo } from '../DiagnosticMessages';
 import { DiagnosticMessages } from '../DiagnosticMessages';
 import { util } from '../util';
-
 import type { Expression } from './Expression';
 import {
     AALiteralExpression,
@@ -75,6 +69,7 @@ import {
     LiteralExpression,
     NamespacedVariableNameExpression,
     NewExpression,
+    RegexLiteralExpression,
     UnaryExpression,
     VariableExpression,
     XmlAttributeGetExpression,
@@ -93,7 +88,6 @@ import { Logger } from '../Logger';
 import { isAAMemberExpression, isAnnotationExpression, isCallExpression, isCallfuncExpression, isClassMethodStatement, isCommentStatement, isDottedGetExpression, isIfStatement, isIndexedGetExpression, isVariableExpression } from '../astUtils/reflection';
 import { createVisitor, WalkMode } from '../astUtils/visitors';
 import { createStringLiteral, createToken } from '../astUtils/creators';
-import { RegexLiteralExpression } from '.';
 
 export class Parser {
     /**

src/parser/Statement.spec.ts

@@ -2,8 +2,8 @@ import { expect } from 'chai';
 import type { NamespaceStatement } from './Statement';
 import { Body, ClassStatement, CommentStatement, EmptyStatement } from './Statement';
 import { ParseMode, Parser } from './Parser';
-import { CancellationTokenSource, WalkMode } from '../astUtils';
-import { Range } from 'vscode-languageserver';
+import { WalkMode } from '../astUtils/visitors';
+import { CancellationTokenSource, Range } from 'vscode-languageserver';
 import { NamespacedVariableNameExpression, VariableExpression } from './Expression';
 import { Program } from '../Program';
 import * as path from 'path';

src/parser/Statement.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-bitwise */
-import type { Token, Identifier } from '../lexer';
-import { CompoundAssignmentOperators, TokenKind } from '../lexer';
+import type { Token, Identifier } from '../lexer/Token';
+import { CompoundAssignmentOperators, TokenKind } from '../lexer/TokenKind';
 import type { BinaryExpression, Expression, NamespacedVariableNameExpression, FunctionExpression, AnnotationExpression, FunctionParameterExpression } from './Expression';
 import { CallExpression, VariableExpression } from './Expression';
 import { util } from '../util';

src/parser/tests/Parser.spec.ts

@@ -1,7 +1,7 @@
-import type { Token } from '../../lexer';
-import { TokenKind, ReservedWords } from '../../lexer';
+import type { Token } from '../../lexer/Token';
+import { TokenKind, ReservedWords } from '../../lexer/TokenKind';
 import { interpolatedRange } from '../../astUtils/creators';
-import type { Range } from '../../astUtils';
+import type { Range } from 'vscode-languageserver';
 
 /* A set of utilities to be used while writing tests for the BRS parser. */
 

src/parser/tests/controlFlow/For.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { Parser } from '../../Parser';
-import { TokenKind } from '../../../lexer';
+import { TokenKind } from '../../../lexer/TokenKind';
 import { EOF, identifier, token } from '../Parser.spec';
 import { Range } from 'vscode-languageserver';
 import type { ForStatement } from '../../Statement';

src/parser/tests/controlFlow/ForEach.spec.ts

@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 
 import { Parser } from '../../Parser';
-import { TokenKind } from '../../../lexer';
+import { TokenKind } from '../../../lexer/TokenKind';
 import { EOF, identifier, token } from '../Parser.spec';
 import { Range } from 'vscode-languageserver';
 import { ForEachStatement } from '../../Statement';

src/parser/tests/controlFlow/If.spec.ts

@@ -1,10 +1,10 @@
 import { expect } from 'chai';
 import * as assert from 'assert';
-
 import { Parser } from '../../Parser';
-import { TokenKind, Lexer } from '../../../lexer';
+import { Lexer } from '../../../lexer/Lexer';
+import { TokenKind } from '../../../lexer/TokenKind';
 import { EOF, identifier, rangeMatch, token } from '../Parser.spec';
-import { isBlock, isCommentStatement, isIfStatement } from '../../../astUtils';
+import { isBlock, isCommentStatement, isIfStatement } from '../../../astUtils/reflection';
 import type { Block, IfStatement } from '../../Statement';
 
 describe('parser if statements', () => {

src/parser/tests/controlFlow/While.spec.ts

@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 
 import { Parser } from '../../Parser';
-import { TokenKind } from '../../../lexer';
+import { TokenKind } from '../../../lexer/TokenKind';
 import { EOF, identifier, token } from '../Parser.spec';
 import { Range } from 'vscode-languageserver';
 

src/parser/tests/expression/Additive.spec.ts

@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 
 import { Parser } from '../../Parser';
-import { TokenKind } from '../../../lexer';
+import { TokenKind } from '../../../lexer/TokenKind';
 import { EOF, identifier, token } from '../Parser.spec';
 import { Range } from 'vscode-languageserver';
 

src/parser/tests/expression/ArrayLiterals.spec.ts

@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 
 import { Parser } from '../../Parser';
-import { TokenKind } from '../../../lexer';
+import { TokenKind } from '../../../lexer/TokenKind';
 import { EOF, identifier, token } from '../Parser.spec';
 import { Range } from 'vscode-languageserver';
 

src/parser/tests/expression/AssociativeArrayLiterals.spec.ts

@@ -1,12 +1,12 @@
 import { expect } from 'chai';
 
 import { Parser } from '../../Parser';
-import { TokenKind } from '../../../lexer';
+import { TokenKind } from '../../../lexer/TokenKind';
 import { EOF, identifier, token } from '../Parser.spec';
 import { Range } from 'vscode-languageserver';
 import type { AssignmentStatement } from '../../Statement';
 import type { AALiteralExpression } from '../../Expression';
-import { isCommentStatement } from '../../../astUtils';
+import { isCommentStatement } from '../../../astUtils/reflection';
 
 describe('parser associative array literals', () => {
     describe('empty associative arrays', () => {

src/parser/tests/expression/Boolean.spec.ts

@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 
 import { Parser } from '../../Parser';
-import { TokenKind } from '../../../lexer';
+import { TokenKind } from '../../../lexer/TokenKind';
 import { EOF, identifier, token } from '../Parser.spec';
 import { Range } from 'vscode-languageserver';
 

src/parser/tests/expression/Call.spec.ts

@@ -1,7 +1,8 @@
 import { expect } from 'chai';
 
 import { Parser } from '../../Parser';
-import { TokenKind, Lexer } from '../../../lexer';
+import { Lexer } from '../../../lexer/Lexer';
+import { TokenKind } from '../../../lexer/TokenKind';
 import { EOF, identifier, token } from '../Parser.spec';
 import { Range } from 'vscode-languageserver';