chore: update dependencies

package.json

@@ -1,7 +1,7 @@
 {
   "name": "typedoc",
   "description": "Create api documentations for typescript projects.",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "homepage": "http://typedoc.org",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -30,13 +30,13 @@
     "node": ">= 4.2.0"
   },
   "dependencies": {
-    "@types/fs-extra": "5.0.1",
-    "@types/handlebars": "4.0.36",
-    "@types/highlight.js": "9.12.2",
-    "@types/lodash": "4.14.104",
-    "@types/marked": "0.3.0",
-    "@types/minimatch": "3.0.3",
-    "@types/shelljs": "0.7.8",
+    "@types/fs-extra": "^5.0.4",
+    "@types/handlebars": "^4.0.39",
+    "@types/highlight.js": "^9.12.3",
+    "@types/lodash": "^4.14.115",
+    "@types/marked": "^0.3.0",
+    "@types/minimatch": "^3.0.3",
+    "@types/shelljs": "^0.7.9",
     "fs-extra": "^5.0.0",
     "handlebars": "^4.0.6",
     "highlight.js": "^9.0.0",
@@ -46,24 +46,25 @@
     "progress": "^2.0.0",
     "shelljs": "^0.8.1",
     "typedoc-default-themes": "^0.5.0",
-    "typescript": "2.7.2"
+    "typescript": "^3.0.1"
   },
   "devDependencies": {
-    "@types/mocha": "2.2.48",
+    "@types/mocha": "^2.2.48",
     "@types/mockery": "^1.4.29",
-    "grunt": "^1.0.2",
+    "grunt": "^1.0.3",
     "grunt-cli": "^1.2.0",
     "grunt-contrib-clean": "^1.0.0",
     "grunt-contrib-copy": "^1.0.0",
-    "grunt-contrib-watch": "^1.0.0",
+    "grunt-contrib-watch": "^1.1.0",
     "grunt-mocha-istanbul": "^5.0.1",
     "grunt-string-replace": "^1.2.0",
     "grunt-ts": "^5.5.1",
-    "grunt-tslint": "^5.0.1",
+    "grunt-tslint": "^5.0.2",
     "istanbul": "^0.4.1",
-    "mocha": "^5.0.4",
+    "jake": "^8.0.16",
+    "mocha": "^5.2.0",
     "mockery": "^2.1.0",
-    "tslint": "^5.9.1"
+    "tslint": "^5.11.0"
   },
   "files": [
     "bin",

src/lib/converter/factories/declaration.ts

@@ -24,7 +24,7 @@ const nonStaticKinds = [
  * @param name  The desired name of the reflection.
  * @returns The resulting reflection.
  */
-export function createDeclaration(context: Context, node: ts.Node, kind: ReflectionKind, name?: string): DeclarationReflection {
+export function createDeclaration(context: Context, node: ts.Declaration, kind: ReflectionKind, name?: string): DeclarationReflection {
     const container = <ContainerReflection> context.scope;
     if (!(container instanceof ContainerReflection)) {
         throw new Error('Expected container reflection.');
@@ -54,7 +54,7 @@ export function createDeclaration(context: Context, node: ts.Node, kind: Reflect
     if (kind === ReflectionKind.ExternalModule) {
         isExported = true; // Always mark external modules as exported
     } else if (node.parent && node.parent.kind === ts.SyntaxKind.VariableDeclarationList) {
-        const parentModifiers = ts.getCombinedModifierFlags(node.parent.parent);
+        const parentModifiers = ts.getCombinedModifierFlags(node.parent.parent as ts.Declaration);
         isExported = isExported || !!(parentModifiers & ts.ModifierFlags.Export);
     } else {
         isExported = isExported || !!(modifiers & ts.ModifierFlags.Export);
@@ -99,7 +99,7 @@ export function createDeclaration(context: Context, node: ts.Node, kind: Reflect
         child.setFlag(ReflectionFlag.Static, isStatic);
         child.setFlag(ReflectionFlag.Private, isPrivate);
         child.setFlag(ReflectionFlag.ConstructorProperty, isConstructorProperty);
-        child.setFlag(ReflectionFlag.Exported,  isExported);
+        child.setFlag(ReflectionFlag.Exported, isExported);
         child = setupDeclaration(context, child, node);
 
         if (child) {
@@ -127,13 +127,13 @@ export function createDeclaration(context: Context, node: ts.Node, kind: Reflect
  * @param node  The TypeScript node whose properties should be applies to the given reflection.
  * @returns The reflection populated with the values of the given node.
  */
-function setupDeclaration(context: Context, reflection: DeclarationReflection, node: ts.Node) {
+function setupDeclaration(context: Context, reflection: DeclarationReflection, node: ts.Declaration) {
     const modifiers = ts.getCombinedModifierFlags(node);
 
-    reflection.setFlag(ReflectionFlag.External,  context.isExternal);
+    reflection.setFlag(ReflectionFlag.External, context.isExternal);
     reflection.setFlag(ReflectionFlag.Protected, !!(modifiers & ts.ModifierFlags.Protected));
-    reflection.setFlag(ReflectionFlag.Public,    !!(modifiers & ts.ModifierFlags.Public));
-    reflection.setFlag(ReflectionFlag.Optional,  !!(node['questionToken']));
+    reflection.setFlag(ReflectionFlag.Public, !!(modifiers & ts.ModifierFlags.Public));
+    reflection.setFlag(ReflectionFlag.Optional, !!(node['questionToken']));
 
     if (
         context.isInherit &&

src/lib/converter/nodes/function.ts

@@ -28,7 +28,7 @@ export class FunctionConverter extends ConverterNodeComponent<ts.FunctionDeclara
         const scope   = context.scope;
         const kind    = scope.kind & ReflectionKind.ClassOrInterface ? ReflectionKind.Method : ReflectionKind.Function;
         const hasBody = !!node.body;
-        const method  = createDeclaration(context, <ts.Node> node, kind);
+        const method  = createDeclaration(context, node, kind);
 
         if (method  // child inheriting will return null on createDeclaration
             && kind & ReflectionKind.Method

src/lib/ts-internal.ts

@@ -98,7 +98,7 @@ export function isBindingPattern(node: ts.Node): node is ts.BindingPattern {
 
 // https://github.com/Microsoft/TypeScript/blob/v2.1.4/src/compiler/utilities.ts#L1729
 export function getClassExtendsHeritageClauseElement(node: ts.ClassLikeDeclaration | ts.InterfaceDeclaration) {
-  return tsany.getClassExtendsHeritageClauseElement.apply(this, arguments);
+  return tsany.getClassExtendsHeritageElement.apply(this, arguments);
 }
 
 // https://github.com/Microsoft/TypeScript/blob/v2.1.4/src/compiler/utilities.ts#L1734

src/test/converter/constructor-properties/specs.json

@@ -125,7 +125,6 @@
               "id": 4,
               "name": "x",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isConstructorProperty": true,
                 "isPublic": true
@@ -135,7 +134,7 @@
               },
               "sources": [
                 {
-                  "fileName": "constructor-properties.ts",
+                  "fileName": "%BASE%/constructor-properties/constructor-properties.ts",
                   "line": 11,
                   "character": 24
                 }
@@ -149,7 +148,6 @@
               "id": 5,
               "name": "y",
               "kind": 1024,
-              "kindString": "Property",
               "flags": {
                 "isConstructorProperty": true,
                 "isPublic": true
@@ -159,7 +157,7 @@
               },
               "sources": [
                 {
-                  "fileName": "constructor-properties.ts",
+                  "fileName": "%BASE%/constructor-properties/constructor-properties.ts",
                   "line": 11,
                   "character": 41
                 }
@@ -364,8 +362,7 @@
               },
               "inheritedFrom": {
                 "type": "reference",
-                "name": "Vector2.x",
-                "id": 4
+                "name": "Vector2.x"
               }
             },
             {
@@ -393,8 +390,7 @@
               },
               "overwrites": {
                 "type": "reference",
-                "name": "Vector2.y",
-                "id": 5
+                "name": "Vector2.y"
               }
             },
             {

src/test/converter/decorators/specs.json

@@ -48,8 +48,7 @@
                   "name": "decoratorAtom",
                   "type": {
                     "type": "reference",
-                    "name": "decoratorAtom",
-                    "id": 5
+                    "name": "decoratorAtom"
                   }
                 },
                 {
@@ -69,7 +68,6 @@
                   "id": 4,
                   "name": "decoratedMethod",
                   "kind": 4096,
-                  "kindString": "Call signature",
                   "flags": {},
                   "comment": {
                     "shortText": "A decorated method."
@@ -110,15 +108,7 @@
           "id": 5,
           "name": "decoratorAtom",
           "kind": 64,
-          "kindString": "Function",
           "flags": {},
-          "decorates": [
-            {
-              "type": "reference",
-              "name": "decoratedMethod",
-              "id": 3
-            }
-          ],
           "signatures": [
             {
               "id": 6,
@@ -187,7 +177,7 @@
           ],
           "sources": [
             {
-              "fileName": "decorators.ts",
+              "fileName": "%BASE%/decorators/decorators.ts",
               "line": 21,
               "character": 22
             }

src/test/converter/destructuring/specs.json

@@ -18,11 +18,10 @@
           "id": 5,
           "name": "destructArrayA",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {},
           "sources": [
             {
-              "fileName": "destructuring.ts",
+              "fileName": "%BASE%/destructuring/destructuring.ts",
               "line": 10,
               "character": 21
             }
@@ -214,11 +213,10 @@
           "id": 4,
           "name": "destructObjectC",
           "kind": 32,
-          "kindString": "Variable",
           "flags": {},
           "sources": [
             {
-              "fileName": "destructuring.ts",
+              "fileName": "%BASE%/destructuring/destructuring.ts",
               "line": 4,
               "character": 56
             }

src/test/converter/enum/specs.json

@@ -217,7 +217,6 @@
               "id": 4,
               "name": "EnumValue2",
               "kind": 16,
-              "kindString": "Enumeration member",
               "flags": {
                 "isExported": true
               },
@@ -226,7 +225,7 @@
               },
               "sources": [
                 {
-                  "fileName": "enum.ts",
+                  "fileName": "%BASE%/enum/enum.ts",
                   "line": 14,
                   "character": 14
                 }
@@ -237,7 +236,6 @@
               "id": 5,
               "name": "EnumValue3",
               "kind": 16,
-              "kindString": "Enumeration member",
               "flags": {
                 "isExported": true
               },
@@ -246,7 +244,7 @@
               },
               "sources": [
                 {
-                  "fileName": "enum.ts",
+                  "fileName": "%BASE%/enum/enum.ts",
                   "line": 19,
                   "character": 14
                 }

src/test/converter/events-overloads/specs.json

@@ -41,7 +41,6 @@
                   "id": 4,
                   "name": "on",
                   "kind": 8388608,
-                  "kindString": "Event",
                   "flags": {},
                   "comment": {
                     "shortText": "Subscribe for a general event by name."
@@ -51,7 +50,6 @@
                       "id": 5,
                       "name": "event",
                       "kind": 32768,
-                      "kindString": "Parameter",
                       "flags": {},
                       "comment": {
                         "text": "The name of the event to subscribe for."

src/test/converter/export-assignment/specs.json

@@ -35,7 +35,6 @@
                   "id": 4,
                   "name": "x",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",
@@ -46,7 +45,6 @@
                   "id": 5,
                   "name": "y",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",

src/test/converter/export-with-local/specs.json

@@ -70,14 +70,12 @@
               "id": 4,
               "name": "add",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "parameters": [
                 {
                   "id": 5,
                   "name": "x",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",

src/test/converter/export/specs.json

@@ -49,14 +49,12 @@
               "id": 4,
               "name": "add",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "parameters": [
                 {
                   "id": 5,
                   "name": "x",
                   "kind": 32768,
-                  "kindString": "Parameter",
                   "flags": {},
                   "type": {
                     "type": "intrinsic",

src/test/converter/function/specs.json

@@ -176,7 +176,6 @@
           "id": 4,
           "name": "exportedFunction",
           "kind": 64,
-          "kindString": "Function",
           "flags": {
             "isExported": true
           },
@@ -185,7 +184,6 @@
               "id": 5,
               "name": "exportedFunction",
               "kind": 4096,
-              "kindString": "Call signature",
               "flags": {},
               "comment": {
                 "shortText": "This is a simple exported function."
@@ -198,7 +196,7 @@
           ],
           "sources": [
             {
-              "fileName": "function.ts",
+              "fileName": "%BASE%/function/function.ts",
               "line": 10,
               "character": 32
             }