Use typescript 3.2.x (#922)

* Use typescript 3.2.x * Fix destructuring specs
TypeStrong · Jan 2, 2019 · b2f4134 · b2f4134
1 parent 1c4c515
commit b2f4134
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 18 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     "progress": "^2.0.0",
     "shelljs": "^0.8.2",
     "typedoc-default-themes": "^0.5.0",
-    "typescript": "3.1.x"
+    "typescript": "3.2.x"
   },
   "devDependencies": {
     "@types/mocha": "^5.2.4",

diff --git a/src/lib/converter/plugins/SourcePlugin.ts b/src/lib/converter/plugins/SourcePlugin.ts
@@ -108,7 +108,7 @@ export class SourcePlugin extends ConverterComponent {
             file.reflections.push(reflection);
         }
 
-        reflection.sources!.push({
+        reflection.sources.push({
             file: file,
             fileName: fileName,
             line: position.line + 1,

diff --git a/src/lib/converter/types/tuple.ts b/src/lib/converter/types/tuple.ts
@@ -17,7 +17,19 @@ export class TupleConverter extends ConverterTypeComponent implements TypeConver
      * Test whether this converter can handle the given TypeScript type.
      */
     supportsType(context: Context, type: ts.TypeReference): boolean {
-        return !!(type.objectFlags & ts.ObjectFlags.Tuple);
+        // If this type is a tuple
+        if (type.objectFlags & ts.ObjectFlags.Tuple) {
+            return true;
+        }
+
+        // If this type points to a tuple
+        if (type.objectFlags & ts.ObjectFlags.Reference) {
+            if (type.target.objectFlags & ts.ObjectFlags.Tuple) {
+                return true;
+            }
+        }
+
+        return false;
     }
 
     /**

diff --git a/src/test/converter/destructuring/specs.json b/src/test/converter/destructuring/specs.json
@@ -109,11 +109,17 @@
             }
           ],
           "type": {
-            "type": "array",
-            "elementType": {
-              "type": "intrinsic",
-              "name": "number"
-            }
+            "type": "tuple",
+            "elements": [
+              {
+                "type": "intrinsic",
+                "name": "number"
+              },
+              {
+                "type": "intrinsic",
+                "name": "number"
+              }
+            ]
           }
         },
         {
@@ -130,11 +136,17 @@
             }
           ],
           "type": {
-            "type": "array",
-            "elementType": {
-              "type": "intrinsic",
-              "name": "number"
-            }
+            "type": "tuple",
+            "elements": [
+              {
+                "type": "intrinsic",
+                "name": "number"
+              },
+              {
+                "type": "intrinsic",
+                "name": "number"
+              }
+            ]
           }
         },
         {

diff --git a/src/test/renderer/specs/modules/_typescript_1_5_.html b/src/test/renderer/specs/modules/_typescript_1_5_.html
@@ -140,7 +140,7 @@ <h3>destruct<wbr>Array<wbr>With<wbr>IgnoresA</h3>
 				<section class="tsd-panel tsd-member tsd-kind-variable tsd-parent-kind-external-module tsd-is-not-exported">
 					<a name="destructarraywithignoresrest" class="tsd-anchor"></a>
 					<h3>destruct<wbr>Array<wbr>With<wbr>Ignores<wbr>Rest</h3>
-					<div class="tsd-signature tsd-kind-icon">destruct<wbr>Array<wbr>With<wbr>Ignores<wbr>Rest<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">number</span><span class="tsd-signature-symbol">[]</span></div>
+					<div class="tsd-signature tsd-kind-icon">destruct<wbr>Array<wbr>With<wbr>Ignores<wbr>Rest<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-symbol">[</span><span class="tsd-signature-type">number</span><span class="tsd-signature-symbol">, </span><span class="tsd-signature-type">number</span><span class="tsd-signature-symbol">]</span></div>
 					<aside class="tsd-sources">
 						<ul>
 							<li>Defined in <a href="https://github.com/sebastian-lenz/typedoc/blob/master/examples/basic/src/typescript-1.5.ts#L20">typescript-1.5.ts:20</a></li>
@@ -150,7 +150,7 @@ <h3>destruct<wbr>Array<wbr>With<wbr>Ignores<wbr>Rest</h3>
 				<section class="tsd-panel tsd-member tsd-kind-variable tsd-parent-kind-external-module tsd-is-not-exported">
 					<a name="destructarraywithrest" class="tsd-anchor"></a>
 					<h3>destruct<wbr>Array<wbr>With<wbr>Rest</h3>
-					<div class="tsd-signature tsd-kind-icon">destruct<wbr>Array<wbr>With<wbr>Rest<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">number</span><span class="tsd-signature-symbol">[]</span></div>
+					<div class="tsd-signature tsd-kind-icon">destruct<wbr>Array<wbr>With<wbr>Rest<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-symbol">[</span><span class="tsd-signature-type">number</span><span class="tsd-signature-symbol">, </span><span class="tsd-signature-type">number</span><span class="tsd-signature-symbol">]</span></div>
 					<aside class="tsd-sources">
 						<ul>
 							<li>Defined in <a href="https://github.com/sebastian-lenz/typedoc/blob/master/examples/basic/src/typescript-1.5.ts#L15">typescript-1.5.ts:15</a></li>