Update to TypeScript 2.2.1 (#448)

Author: devpaul

package.json

@@ -27,7 +27,7 @@
     }
   ],
   "engines": {
-    "node": ">= 4"
+    "node": ">= 4.2.0"
   },
   "dependencies": {
     "@types/fs-extra": "0.0.33",
@@ -46,7 +46,7 @@
     "progress": "^1.1.8",
     "shelljs": "^0.7.0",
     "typedoc-default-themes": "^0.4.2",
-    "typescript": "2.1.6"
+    "typescript": "2.2.1"
   },
   "devDependencies": {
     "@types/mocha": "^2.2.39",

src/lib/utils/options/declaration.ts

@@ -46,7 +46,7 @@ export class OptionDeclaration {
 
     scope: ParameterScope;
 
-    map: Object;
+    protected map: Object | Map<string, any> | 'object';
 
     mapError: string;
 
@@ -92,10 +92,14 @@ export class OptionDeclaration {
                 }
                 break;
             case ParameterType.Map:
-                if (this.map !== 'object') {
+                const map = this.map;
+                if (map !== 'object') {
                     const key = value ? (value + '').toLowerCase() : '';
-                    if (key in this.map) {
-                        value = this.map[key];
+
+                    if (map instanceof Map && map.has(key)) {
+                        value = map.get(key);
+                    } else if (key in map) {
+                        value = map[key];
                     } else if (errorCallback) {
                         if (this.mapError) {
                             errorCallback(this.mapError);

src/lib/utils/options/options.ts

@@ -151,7 +151,7 @@ export class Options extends ChildableComponent<Application, OptionsComponent> {
         for (let key in obj) {
             const value = obj[key];
             const declaration = this.getDeclaration(key);
-            const shouldValueBeAnObject = declaration && declaration.map === 'object';
+            const shouldValueBeAnObject = declaration && declaration['map'] === 'object';
             if (typeof value === 'object' && !shouldValueBeAnObject) {
                 this.setValues(value, prefix + key + '.', errorCallback);
             } else {

src/test/renderer.ts

@@ -20,7 +20,7 @@ function getFileIndex(base, dir: string = '', results: string[] = []) {
 function compareDirectories(a, b) {
     const aFiles = getFileIndex(a);
     const bFiles = getFileIndex(b);
-    Assert.deepEqual(aFiles, bFiles, 'Generated files differ.');
+    Assert.deepEqual(aFiles, bFiles, `Generated files differ. between "${ a }" and "${ b }"`);
 
     const gitHubRegExp = /https:\/\/github.com\/[A-Za-z0-9\-]+\/typedoc\/blob\/[^\/]*\/examples/g;
     aFiles.forEach(function (file) {

tsconfig.json

@@ -1,6 +1,11 @@
 {
   "compilerOptions": {
     "module": "commonjs",
+    "lib": [
+      "DOM",
+      "ES5",
+      "ES2015.Collection"
+    ],
     "target": "ES5",
     "noImplicitAny": false,
     "removeComments": true,