Removed Typescript as a constructor argument to instead use the one that is located in node_modules.

Author: wessberg

README.md

@@ -100,6 +100,10 @@ The LanguageService will not track any mutations for already-initialized variabl
 
 ## Changelog:
 
+**v1.0.16**:
+
+- Removed Typescript as a constructor argument to instead use the one that is located in node_modules.
+
 **v1.0.15**:
 
 - Added a blacklist filter for specific file names (such as tslib.ts or rollup plugins.)

src/service/CodeAnalyzer.ts

@@ -1,6 +1,6 @@
 import {IFileLoader} from "@wessberg/fileloader";
 import {IMarshaller} from "@wessberg/marshaller";
-import * as ts from "typescript";
+import * as typescript from "typescript";
 import {ArrowFunction, BinaryExpression, CallExpression, ClassDeclaration, CompilerOptions, Declaration, ExportAssignment, ExportDeclaration, Expression, ExpressionStatement, FunctionDeclaration, ImportDeclaration, ImportEqualsDeclaration, IScriptSnapshot, LanguageService, ModuleKind, Node, NodeArray, ScriptTarget, Statement, SyntaxKind, VariableStatement} from "typescript";
 import {Cache} from "../cache/Cache";
 import {ICache} from "../cache/interface/ICache";
@@ -125,9 +125,8 @@ export class CodeAnalyzer implements ICodeAnalyzer {
 	private typeUtil: ITypeUtil;
 	private files: Map<string, { version: number, content: string }> = new Map();
 	constructor (private marshaller: IMarshaller,
-							 private fileLoader: IFileLoader,
-							 public typescript: typeof ts = ts) {
-		this.languageService = this.typescript.createLanguageService(this, typescript.createDocumentRegistry());
+							 private fileLoader: IFileLoader) {
+		this.languageService = typescript.createLanguageService(this, typescript.createDocumentRegistry());
 		this.typeUtil = new TypeUtil();
 		this.tokenSerializer = new TokenSerializer();
 		this.tokenPredicator = new TokenPredicator();
@@ -260,7 +259,7 @@ export class CodeAnalyzer implements ICodeAnalyzer {
 	public getScriptSnapshot (fileName: string): IScriptSnapshot|undefined {
 		const file = this.files.get(fileName);
 		if (file == null) return undefined;
-		return this.typescript.ScriptSnapshot.fromString(file.content);
+		return typescript.ScriptSnapshot.fromString(file.content);
 	}
 
 	/**
@@ -277,7 +276,7 @@ export class CodeAnalyzer implements ICodeAnalyzer {
 	 * @returns {string}
 	 */
 	public getDefaultLibFileName (options: CompilerOptions): string {
-		return this.typescript.getDefaultLibFilePath(options);
+		return typescript.getDefaultLibFilePath(options);
 	}
 
 	/**

src/service/interface/ICodeAnalyzer.ts

@@ -1,4 +1,3 @@
-import * as ts from "typescript";
 import {ArrayLiteralExpression, BooleanLiteral, Expression, LanguageServiceHost, Node, NodeArray, NoSubstitutionTemplateLiteral, NumericLiteral, ObjectLiteralExpression, RegularExpressionLiteral, Statement, StringLiteral, SyntaxKind} from "typescript";
 
 import {IBindingIdentifier} from "../../model/interface/IBindingIdentifier";
@@ -313,7 +312,6 @@ export declare type ArbitraryValueArray = ArbitraryValueIndexable[];
 export declare type InitializationValue = ArbitraryValueArray;
 
 export interface ICodeAnalyzer extends LanguageServiceHost {
-	typescript: typeof ts;
 	addFile (fileName: string, content: string, version?: number): NodeArray<Statement>;
 	getFile(fileName: string): NodeArray<Statement>;
 	removeFile (fileName: string): void;