Tighten typings.

Author: garthk

test/demo.ts

@@ -19,7 +19,7 @@ export const lab = script({
     }
 });
 
-global['leakedButOK'] = true;
+(global as any)['leakedButOK'] = true;
 
 const debug = require('debug')('lab-transform-typescript:test');
 
@@ -62,7 +62,7 @@ lab.experiment('experiment', () => {
     lab.test('promise', () => debugp('promise test'));
 });
 
-function debugp(message): Promise<void> {
+function debugp(message: string): Promise<void> {
     return new Promise<void>(resolve => {
         setImmediate(() => {
             debug(message);

tsconfig.json

@@ -8,18 +8,17 @@
     "experimentalDecorators": true,
     "module": "commonjs",
     "moduleResolution": "node",
+    "noImplicitAny": true,
     "outDir": "dist",
     "sourceMap": true,
     "target": "es5",
-    "typeRoots": [
-      "typings-local"
-    ],
     "lib": [
       "es5",
       "es2015.promise"
     ]
   },
   "include": [
-    "test"
+    "test",
+    "typings-local"
   ]
 }

typings-local/code.d.ts

@@ -75,8 +75,8 @@ declare module 'code' {
         instanceof<R>(type: Newable<R>): Expectation<T>;
         match: (regex: RegExp) => Expectation<T>
         matches: (regex: RegExp) => Expectation<T>
-        satisfy: (validator: (T) => boolean) => Expectation<T>
-        satisfies: (validator: any) => Expectation<T>
+        satisfy: (validator: (value: T) => boolean) => Expectation<T>
+        satisfies: (validator: (value: T) => boolean) => Expectation<T>
         throw: (type?: typeString, message?: string | RegExp) => Expectation<T>
         throws: (type?: typeString, message?: string | RegExp) => Expectation<T>
     }

typings-local/lab.d.ts

@@ -1,4 +1,4 @@
-declare module 'lab' {
+declare module Lab {
     type ScriptOptions = {
         schedule?: boolean;
         cli?: CommandLineSettings;
@@ -9,7 +9,7 @@ declare module 'lab' {
      * `globals` split into an array, `id` moved to `ids`, and silence`
      * and `verbose` being flattened into `progress`.
      */
-    type CommandLineSettings = {
+    interface CommandLineSettings {
         /** An assertion library module path to require and make available under `Lab.assertions` */
         assert?: string;
 
@@ -110,12 +110,12 @@ declare module 'lab' {
         verbose?: boolean;
     }
 
-    export type ReporterType = 'clover' | 'console' | 'html' | 'json' | 'junit' | 'lcov' | 'tap';
+    type ReporterType = 'clover' | 'console' | 'html' | 'json' | 'junit' | 'lcov' | 'tap';
 
     /**
      * Progress reporting level
      */
-    export const enum ProgressReporting {
+    const enum ProgressReporting {
         /** No dots or test names */
         Silence = 0,
 
@@ -158,14 +158,16 @@ declare module 'lab' {
      */
     type Hook = TakesCallback | ReturnsPromise;
 
-    export type Laboratory = {
+    type Script = {
         experiment: (description: string, experiment: Experiment) => any;
         test: (description: string, test: Test) => any;
         before: (fn: Hook) => void;
         beforeEach: (fn: Hook) => void;
         after: (fn: Hook) => void;
         afterEach: (fn: Hook) => void;
     }
+}
 
-    export function script(options?: Lab.ScriptOptions): Laboratory;
+declare module 'lab' {
+    export function script(options?: Lab.ScriptOptions): Lab.Script;
 }