From 9299a86a8b8fafe190f26f00726eee07d2e4e2a1 Mon Sep 17 00:00:00 2001
From: Yaroslav Admin <devoto13@gmail.com>
Date: Tue, 27 Nov 2018 21:08:52 +0100
Subject: [PATCH] Improved structure of the karma type definitions

---
 types/karma/index.d.ts     | 77 +++++++++++++++++++-------------------
 types/karma/karma-tests.ts | 22 +++++------
 2 files changed, 49 insertions(+), 50 deletions(-)

diff --git a/types/karma/index.d.ts b/types/karma/index.d.ts
index ba258f0997..09b263e104 100644
--- a/types/karma/index.d.ts
+++ b/types/karma/index.d.ts
@@ -14,24 +14,24 @@ import https = require('https');
 import { Appender } from 'log4js';
 
 declare namespace karma {
-    interface Karma {
-        /**
-         * `start` method is deprecated since 0.13. It will be removed in 0.14.
-         * Please use
-         * <code>
-         *     server = new Server(config, [done])
-         *     server.start()
-         * </code>
-         * instead.
-         */
-        server: DeprecatedServer;
-        Server: Server;
-        runner: Runner;
-        stopper: Stopper;
-        launcher: Launcher;
-        VERSION: string;
-        constants: Constants;
-    }
+    /**
+     * `start` method is deprecated since 0.13. It will be removed in 0.14.
+     * Please use
+     * <code>
+     *     server = new Server(config, [done])
+     *     server.start()
+     * </code>
+     * instead.
+     *
+     * @deprecated
+     */
+    const server: DeprecatedServer;
+
+    const runner: Runner;
+    const stopper: Stopper;
+
+    const VERSION: string;
+    const constants: Constants;
 
     interface Constants {
         VERSION: string;
@@ -57,24 +57,25 @@ declare namespace karma {
         EXIT_CODE: string;
     }
 
-    interface LauncherStatic {
-        generateId(): string;
-        // TODO: injector should be of type `di.Injector`
-        new (emitter: NodeJS.EventEmitter, injector: any): Launcher;
-    }
+    namespace launcher {
+        class Launcher {
+            static generateId(): string;
 
-    interface Launcher {
-        Launcher: LauncherStatic;
-        // TODO: Can this return value ever be typified?
-        launch(names: string[], protocol: string, hostname: string, port: number, urlRoot: string): any[];
-        kill(id: string, callback: () => void): boolean;
-        restart(id: string): boolean;
-        killAll(callback: () => void): void;
-        areAllCaptured(): boolean;
-        markCaptured(id: string): void;
+            constructor(emitter: NodeJS.EventEmitter, injector: any);
+
+            // TODO: Can this return value ever be typified?
+            launch(names: string[], protocol: string, hostname: string, port: number, urlRoot: string): any[];
+            kill(id: string, callback: () => void): boolean;
+            restart(id: string): boolean;
+            killAll(callback: () => void): void;
+            areAllCaptured(): boolean;
+            markCaptured(id: string): void;
+        }
     }
 
+    /** @deprecated */
     interface DeprecatedServer {
+        /** @deprecated */
         start(options?: any, callback?: ServerCallback): void;
     }
 
@@ -97,10 +98,8 @@ declare namespace karma {
         success: number;
     }
 
-    interface Server extends NodeJS.EventEmitter {
-        // TODO: Figure out how to convert Server to class and remove suppression
-        // tslint:disable-next-line:no-misused-new
-        new (options?: ConfigOptions | ConfigFile, callback?: ServerCallback): Server;
+    class Server extends NodeJS.EventEmitter {
+        constructor(options?: ConfigOptions | ConfigFile, callback?: ServerCallback);
         /**
          * Start the server
          */
@@ -468,8 +467,10 @@ declare namespace karma {
         flags?: string[];
         platform?: string;
     }
+
+    namespace config {
+        function parseConfig(configFilePath: string, cliOptions: ConfigOptions): Config;
+    }
 }
 
-declare var karma: karma.Karma;
-
 export = karma;
diff --git a/types/karma/karma-tests.ts b/types/karma/karma-tests.ts
index 4114a77b02..4065a4deff 100644
--- a/types/karma/karma-tests.ts
+++ b/types/karma/karma-tests.ts
@@ -1,16 +1,6 @@
-import gulp = require('gulp');
 import karma = require('karma');
 
-function runKarma(singleRun: boolean): void {
-    // MEMO: `start` method is deprecated since 0.13. It will be removed in 0.14.
-    karma.server.start({
-        configFile: __dirname + '/karma.conf.js',
-        singleRun
-    });
-}
-
-gulp.task('test:unit:karma', gulp.parallel('build:test:unit', () => runKarma(true)));
-
+// karma.server is deprecated and will eventually be removed
 karma.server.start({port: 9876}, (exitCode: number) => {
   console.log('Karma has exited with ' + exitCode);
   process.exit(exitCode);
@@ -54,7 +44,8 @@ karma.runner.run({port: 9876}, (exitCode: number) => {
     process.exit(exitCode);
 });
 
-const captured: boolean = karma.launcher.areAllCaptured();
+const launcher: karma.launcher.Launcher = null;
+const captured: boolean = launcher.areAllCaptured();
 
 // Example of configuration file karma.conf.ts, see http://karma-runner.github.io/latest/config/configuration-file.html
 module.exports = (config: karma.Config) => {
@@ -123,3 +114,10 @@ const foo = (config: karma.Config) => {
     }
   });
 };
+
+console.log(karma.constants.DEFAULT_HOSTNAME);
+console.log(karma.VERSION);
+
+karma.config.parseConfig('karma.conf.js', {
+    singleRun: true
+});