CONVERSION STEP - inlineImports

This step converts as many explicit accesses as possible in favor of direct imports from the modules in which things were declared. This restores the code (as much as possible) back to how it looked originally before the explicitify step, e.g. instead of "ts.Node" and "ts.Symbol", we have just "Node" and "Symbol".

Author: jakebailey

src/compiler/binder.ts

@@ -1,14 +1,14 @@
-import * as ts from "./_namespaces/ts";
+import { BuildInfo, Diagnostic } from "./_namespaces/ts";
 
 export interface EmitOutput {
     outputFiles: OutputFile[];
     emitSkipped: boolean;
-    /* @internal */ diagnostics: readonly ts.Diagnostic[];
+    /* @internal */ diagnostics: readonly Diagnostic[];
 }
 
 export interface OutputFile {
     name: string;
     writeByteOrderMark: boolean;
     text: string;
-    /* @internal */ buildInfo?: ts.BuildInfo
+    /* @internal */ buildInfo?: BuildInfo
 }

src/compiler/builder.ts

@@ -1,16 +1,16 @@
-import * as ts from "../_namespaces/ts";
+import { Node, objectAllocator, SyntaxKind } from "../_namespaces/ts";
 
 /**
  * A `BaseNodeFactory` is an abstraction over an `ObjectAllocator` that handles caching `Node` constructors
  * and allocating `Node` instances based on a set of predefined types.
  */
 /* @internal */
 export interface BaseNodeFactory {
-    createBaseSourceFileNode(kind: ts.SyntaxKind): ts.Node;
-    createBaseIdentifierNode(kind: ts.SyntaxKind): ts.Node;
-    createBasePrivateIdentifierNode(kind: ts.SyntaxKind): ts.Node;
-    createBaseTokenNode(kind: ts.SyntaxKind): ts.Node;
-    createBaseNode(kind: ts.SyntaxKind): ts.Node;
+    createBaseSourceFileNode(kind: SyntaxKind): Node;
+    createBaseIdentifierNode(kind: SyntaxKind): Node;
+    createBasePrivateIdentifierNode(kind: SyntaxKind): Node;
+    createBaseTokenNode(kind: SyntaxKind): Node;
+    createBaseNode(kind: SyntaxKind): Node;
 }
 
 /** @internal */
@@ -19,11 +19,11 @@ export interface BaseNodeFactory {
  */
 export function createBaseNodeFactory(): BaseNodeFactory {
     // tslint:disable variable-name
-    let NodeConstructor: new (kind: ts.SyntaxKind, pos?: number, end?: number) => ts.Node;
-    let TokenConstructor: new (kind: ts.SyntaxKind, pos?: number, end?: number) => ts.Node;
-    let IdentifierConstructor: new (kind: ts.SyntaxKind, pos?: number, end?: number) => ts.Node;
-    let PrivateIdentifierConstructor: new (kind: ts.SyntaxKind, pos?: number, end?: number) => ts.Node;
-    let SourceFileConstructor: new (kind: ts.SyntaxKind, pos?: number, end?: number) => ts.Node;
+    let NodeConstructor: new (kind: SyntaxKind, pos?: number, end?: number) => Node;
+    let TokenConstructor: new (kind: SyntaxKind, pos?: number, end?: number) => Node;
+    let IdentifierConstructor: new (kind: SyntaxKind, pos?: number, end?: number) => Node;
+    let PrivateIdentifierConstructor: new (kind: SyntaxKind, pos?: number, end?: number) => Node;
+    let SourceFileConstructor: new (kind: SyntaxKind, pos?: number, end?: number) => Node;
     // tslint:enable variable-name
 
     return {
@@ -34,23 +34,23 @@ export function createBaseNodeFactory(): BaseNodeFactory {
         createBaseNode
     };
 
-    function createBaseSourceFileNode(kind: ts.SyntaxKind): ts.Node {
-        return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, /*pos*/ -1, /*end*/ -1);
+    function createBaseSourceFileNode(kind: SyntaxKind): Node {
+        return new (SourceFileConstructor || (SourceFileConstructor = objectAllocator.getSourceFileConstructor()))(kind, /*pos*/ -1, /*end*/ -1);
     }
 
-    function createBaseIdentifierNode(kind: ts.SyntaxKind): ts.Node {
-        return new (IdentifierConstructor || (IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor()))(kind, /*pos*/ -1, /*end*/ -1);
+    function createBaseIdentifierNode(kind: SyntaxKind): Node {
+        return new (IdentifierConstructor || (IdentifierConstructor = objectAllocator.getIdentifierConstructor()))(kind, /*pos*/ -1, /*end*/ -1);
     }
 
-    function createBasePrivateIdentifierNode(kind: ts.SyntaxKind): ts.Node {
-        return new (PrivateIdentifierConstructor || (PrivateIdentifierConstructor = ts.objectAllocator.getPrivateIdentifierConstructor()))(kind, /*pos*/ -1, /*end*/ -1);
+    function createBasePrivateIdentifierNode(kind: SyntaxKind): Node {
+        return new (PrivateIdentifierConstructor || (PrivateIdentifierConstructor = objectAllocator.getPrivateIdentifierConstructor()))(kind, /*pos*/ -1, /*end*/ -1);
     }
 
-    function createBaseTokenNode(kind: ts.SyntaxKind): ts.Node {
-        return new (TokenConstructor || (TokenConstructor = ts.objectAllocator.getTokenConstructor()))(kind, /*pos*/ -1, /*end*/ -1);
+    function createBaseTokenNode(kind: SyntaxKind): Node {
+        return new (TokenConstructor || (TokenConstructor = objectAllocator.getTokenConstructor()))(kind, /*pos*/ -1, /*end*/ -1);
     }
 
-    function createBaseNode(kind: ts.SyntaxKind): ts.Node {
-        return new (NodeConstructor || (NodeConstructor = ts.objectAllocator.getNodeConstructor()))(kind, /*pos*/ -1, /*end*/ -1);
+    function createBaseNode(kind: SyntaxKind): Node {
+        return new (NodeConstructor || (NodeConstructor = objectAllocator.getNodeConstructor()))(kind, /*pos*/ -1, /*end*/ -1);
     }
 }