Make module

Author: jakebailey

src/compiler/_namespaces/ts.ts

@@ -2,7 +2,8 @@
 
 export * from "../corePublic";
 export * from "../core";
-export * from "../debug";
+import * as Debug from "../debug";
+export { Debug };
 export * from "../semver";
 export * from "../performanceCore";
 export * from "../perfLogger";

src/compiler/debug.ts

@@ -2032,5 +2032,5 @@ if (sys && sys.getEnvironmentVariable) {
         : AssertionLevel.None);
 }
 if (sys && sys.debugMode) {
-    Debug.isDebugging = true;
+    Debug.setIsDebugging(true);
 }

src/compiler/sys.ts

@@ -264,11 +264,11 @@ function handleTestConfig() {
 }
 
 function beginTests() {
-    ts.Debug.loggingHost = {
+    ts.Debug.setLoggingHost({
         log(_level, s) {
             console.log(s || "");
         }
-    };
+    });
 
     if (ts.Debug.isDebugging) {
         ts.Debug.enableDebugInfo();

src/testRunner/runner.ts

@@ -2,12 +2,12 @@ import * as ts from "../_namespaces/ts";
 import { deprecate } from "../../deprecatedCompat/deprecate";
 
 describe("unittests:: debugDeprecation", () => {
-    let loggingHost: ts.LoggingHost | undefined;
+    let loggingHost: ts.Debug.LoggingHost | undefined;
     beforeEach(() => {
         loggingHost = ts.Debug.loggingHost;
     });
     afterEach(() => {
-        ts.Debug.loggingHost = loggingHost;
+        ts.Debug.setLoggingHost(loggingHost);
         loggingHost = undefined;
     });
     describe("deprecateFunction", () => {
@@ -17,11 +17,11 @@ describe("unittests:: debugDeprecation", () => {
                 typeScriptVersion: "3.8"
             });
             let logWritten = false;
-            ts.Debug.loggingHost = {
+            ts.Debug.setLoggingHost({
                 log() {
                     logWritten = true;
                 }
-            };
+            });
             deprecation();
             assert.isFalse(logWritten);
         });
@@ -31,11 +31,11 @@ describe("unittests:: debugDeprecation", () => {
                 typeScriptVersion: "3.9"
             });
             let logWritten = false;
-            ts.Debug.loggingHost = {
+            ts.Debug.setLoggingHost({
                 log() {
                     logWritten = true;
                 }
-            };
+            });
             deprecation();
             assert.isTrue(logWritten);
         });
@@ -44,11 +44,11 @@ describe("unittests:: debugDeprecation", () => {
                 typeScriptVersion: "3.9"
             });
             let logWritten = false;
-            ts.Debug.loggingHost = {
+            ts.Debug.setLoggingHost({
                 log() {
                     logWritten = true;
                 }
-            };
+            });
             deprecation();
             assert.isTrue(logWritten);
         });
@@ -57,11 +57,11 @@ describe("unittests:: debugDeprecation", () => {
                 typeScriptVersion: "3.9"
             });
             let logWrites = 0;
-            ts.Debug.loggingHost = {
+            ts.Debug.setLoggingHost({
                 log() {
                     logWrites++;
                 }
-            };
+            });
             deprecation();
             deprecation();
             assert.equal(logWrites, 1);
@@ -73,11 +73,11 @@ describe("unittests:: debugDeprecation", () => {
                 typeScriptVersion: "3.9"
             });
             let logWritten = false;
-            ts.Debug.loggingHost = {
+            ts.Debug.setLoggingHost({
                 log() {
                     logWritten = true;
                 }
-            };
+            });
             expect(deprecation).throws();
             assert.isFalse(logWritten);
         });
@@ -86,11 +86,11 @@ describe("unittests:: debugDeprecation", () => {
                 error: true,
             });
             let logWritten = false;
-            ts.Debug.loggingHost = {
+            ts.Debug.setLoggingHost({
                 log() {
                     logWritten = true;
                 }
-            };
+            });
             expect(deprecation).throws();
             assert.isFalse(logWritten);
         });

src/testRunner/unittests/debugDeprecation.ts

@@ -3,11 +3,11 @@ import * as ts from "./_namespaces/ts";
 // This file actually uses arguments passed on commandline and executes it
 
 // enable deprecation logging
-ts.Debug.loggingHost = {
+ts.Debug.setLoggingHost({
     log(_level, s) {
         ts.sys.write(`${s || ""}${ts.sys.newLine}`);
     }
-};
+});
 
 if (ts.Debug.isDebugging) {
     ts.Debug.enableDebugInfo();

src/tsc/tsc.ts

@@ -306,18 +306,18 @@ export function initializeNodeSystem(): StartInput {
     const logger = createLogger();
 
     // enable deprecation logging
-    Debug.loggingHost = {
+    Debug.setLoggingHost({
         log(level, s) {
             switch (level) {
-                case ts.LogLevel.Error:
-                case ts.LogLevel.Warning:
+                case ts.Debug.LogLevel.Error:
+                case ts.Debug.LogLevel.Warning:
                     return logger.msg(s, Msg.Err);
-                case ts.LogLevel.Info:
-                case ts.LogLevel.Verbose:
+                case ts.Debug.LogLevel.Info:
+                case ts.Debug.LogLevel.Verbose:
                     return logger.msg(s, Msg.Info);
             }
         }
-    };
+    });
 
     const pending = createQueue<Buffer>();
     let canWrite = true;

src/tsserver/nodeServer.ts

@@ -1,22 +1,21 @@
 import {
     Debug,
-    LogLevel,
 } from "./_namespaces/ts";
 import * as ts from "./_namespaces/ts";
 
 // enable deprecation logging
 declare const console: any;
 if (typeof console !== "undefined") {
-    Debug.loggingHost = {
+    Debug.setLoggingHost({
         log(level, s) {
             switch (level) {
-                case LogLevel.Error: return console.error(s);
-                case LogLevel.Warning: return console.warn(s);
-                case LogLevel.Info: return console.log(s);
-                case LogLevel.Verbose: return console.log(s);
+                case ts.Debug.LogLevel.Error: return console.error(s);
+                case ts.Debug.LogLevel.Warning: return console.warn(s);
+                case ts.Debug.LogLevel.Info: return console.log(s);
+                case ts.Debug.LogLevel.Verbose: return console.log(s);
             }
         }
-    };
+    });
 }
 
 export = ts;