Skip to content

Commit b2f4134

Browse files
WenzilGerrit0
authored andcommitted
Use typescript 3.2.x (#922)
* Use typescript 3.2.x * Fix destructuring specs
1 parent 1c4c515 commit b2f4134

File tree

6 files changed

+42
-18
lines changed

6 files changed

+42
-18
lines changed

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"progress": "^2.0.0",
4747
"shelljs": "^0.8.2",
4848
"typedoc-default-themes": "^0.5.0",
49-
"typescript": "3.1.x"
49+
"typescript": "3.2.x"
5050
},
5151
"devDependencies": {
5252
"@types/mocha": "^5.2.4",

src/lib/converter/plugins/SourcePlugin.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ export class SourcePlugin extends ConverterComponent {
108108
file.reflections.push(reflection);
109109
}
110110

111-
reflection.sources!.push({
111+
reflection.sources.push({
112112
file: file,
113113
fileName: fileName,
114114
line: position.line + 1,

src/lib/converter/types/tuple.ts

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,19 @@ export class TupleConverter extends ConverterTypeComponent implements TypeConver
1717
* Test whether this converter can handle the given TypeScript type.
1818
*/
1919
supportsType(context: Context, type: ts.TypeReference): boolean {
20-
return !!(type.objectFlags & ts.ObjectFlags.Tuple);
20+
// If this type is a tuple
21+
if (type.objectFlags & ts.ObjectFlags.Tuple) {
22+
return true;
23+
}
24+
25+
// If this type points to a tuple
26+
if (type.objectFlags & ts.ObjectFlags.Reference) {
27+
if (type.target.objectFlags & ts.ObjectFlags.Tuple) {
28+
return true;
29+
}
30+
}
31+
32+
return false;
2133
}
2234

2335
/**

src/test/converter/destructuring/specs.json

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,17 @@
109109
}
110110
],
111111
"type": {
112-
"type": "array",
113-
"elementType": {
114-
"type": "intrinsic",
115-
"name": "number"
116-
}
112+
"type": "tuple",
113+
"elements": [
114+
{
115+
"type": "intrinsic",
116+
"name": "number"
117+
},
118+
{
119+
"type": "intrinsic",
120+
"name": "number"
121+
}
122+
]
117123
}
118124
},
119125
{
@@ -130,11 +136,17 @@
130136
}
131137
],
132138
"type": {
133-
"type": "array",
134-
"elementType": {
135-
"type": "intrinsic",
136-
"name": "number"
137-
}
139+
"type": "tuple",
140+
"elements": [
141+
{
142+
"type": "intrinsic",
143+
"name": "number"
144+
},
145+
{
146+
"type": "intrinsic",
147+
"name": "number"
148+
}
149+
]
138150
}
139151
},
140152
{

src/test/renderer/specs/modules/_typescript_1_5_.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ <h3>destruct<wbr>Array<wbr>With<wbr>IgnoresA</h3>
140140
<section class="tsd-panel tsd-member tsd-kind-variable tsd-parent-kind-external-module tsd-is-not-exported">
141141
<a name="destructarraywithignoresrest" class="tsd-anchor"></a>
142142
<h3>destruct<wbr>Array<wbr>With<wbr>Ignores<wbr>Rest</h3>
143-
<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>
143+
<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>
144144
<aside class="tsd-sources">
145145
<ul>
146146
<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>
150150
<section class="tsd-panel tsd-member tsd-kind-variable tsd-parent-kind-external-module tsd-is-not-exported">
151151
<a name="destructarraywithrest" class="tsd-anchor"></a>
152152
<h3>destruct<wbr>Array<wbr>With<wbr>Rest</h3>
153-
<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>
153+
<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>
154154
<aside class="tsd-sources">
155155
<ul>
156156
<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>

0 commit comments

Comments
 (0)