Skip to content

Commit 5f4e501

Browse files
sebastian-lenzsebastian-lenz
committed
Update to TypeScript 1.5.3, see #122 
1 parent 464cd1e commit 5f4e501

File tree

3 files changed

+320
-222
lines changed

3 files changed

+320
-222
lines changed

‎bin/typedoc.js‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ var td;
183183
td.EventDispatcher = EventDispatcher;
184184
})(td || (td = {}));
185185
/// <reference path="EventDispatcher.ts" />
186-
var __extends = this.__extends || function (d, b) {
186+
var __extends = (this && this.__extends) || function (d, b) {
187187
for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
188188
function __() { this.constructor = d; }
189189
__.prototype = b.prototype;
@@ -2328,72 +2328,72 @@ var td;
23282328
}
23292329
var result;
23302330
switch (node.kind) {
2331-
case 227 /* SourceFile */:
2331+
case 228 /* SourceFile */:
23322332
result = visitSourceFile(context, node);
23332333
break;
2334-
case 174 /* ClassExpression */:
2335-
case 201 /* ClassDeclaration */:
2334+
case 175 /* ClassExpression */:
2335+
case 202 /* ClassDeclaration */:
23362336
result = visitClassDeclaration(context, node);
23372337
break;
2338-
case 202 /* InterfaceDeclaration */:
2338+
case 203 /* InterfaceDeclaration */:
23392339
result = visitInterfaceDeclaration(context, node);
23402340
break;
2341-
case 205 /* ModuleDeclaration */:
2341+
case 206 /* ModuleDeclaration */:
23422342
result = visitModuleDeclaration(context, node);
23432343
break;
2344-
case 180 /* VariableStatement */:
2344+
case 181 /* VariableStatement */:
23452345
result = visitVariableStatement(context, node);
23462346
break;
2347-
case 131 /* PropertySignature */:
2348-
case 132 /* PropertyDeclaration */:
2349-
case 224 /* PropertyAssignment */:
2350-
case 225 /* ShorthandPropertyAssignment */:
2351-
case 198 /* VariableDeclaration */:
2352-
case 152 /* BindingElement */:
2347+
case 132 /* PropertySignature */:
2348+
case 133 /* PropertyDeclaration */:
2349+
case 225 /* PropertyAssignment */:
2350+
case 226 /* ShorthandPropertyAssignment */:
2351+
case 199 /* VariableDeclaration */:
2352+
case 153 /* BindingElement */:
23532353
result = visitVariableDeclaration(context, node);
23542354
break;
2355-
case 204 /* EnumDeclaration */:
2355+
case 205 /* EnumDeclaration */:
23562356
result = visitEnumDeclaration(context, node);
23572357
break;
2358-
case 226 /* EnumMember */:
2358+
case 227 /* EnumMember */:
23592359
result = visitEnumMember(context, node);
23602360
break;
2361-
case 135 /* Constructor */:
2362-
case 139 /* ConstructSignature */:
2361+
case 136 /* Constructor */:
2362+
case 140 /* ConstructSignature */:
23632363
result = visitConstructor(context, node);
23642364
break;
2365-
case 133 /* MethodSignature */:
2366-
case 134 /* MethodDeclaration */:
2367-
case 200 /* FunctionDeclaration */:
2365+
case 134 /* MethodSignature */:
2366+
case 135 /* MethodDeclaration */:
2367+
case 201 /* FunctionDeclaration */:
23682368
result = visitFunctionDeclaration(context, node);
23692369
break;
2370-
case 136 /* GetAccessor */:
2370+
case 137 /* GetAccessor */:
23712371
result = visitGetAccessorDeclaration(context, node);
23722372
break;
2373-
case 137 /* SetAccessor */:
2373+
case 138 /* SetAccessor */:
23742374
result = visitSetAccessorDeclaration(context, node);
23752375
break;
2376-
case 138 /* CallSignature */:
2377-
case 142 /* FunctionType */:
2376+
case 139 /* CallSignature */:
2377+
case 143 /* FunctionType */:
23782378
result = visitCallSignatureDeclaration(context, node);
23792379
break;
2380-
case 140 /* IndexSignature */:
2380+
case 141 /* IndexSignature */:
23812381
result = visitIndexSignatureDeclaration(context, node);
23822382
break;
2383-
case 179 /* Block */:
2384-
case 206 /* ModuleBlock */:
2383+
case 180 /* Block */:
2384+
case 207 /* ModuleBlock */:
23852385
result = visitBlock(context, node);
23862386
break;
2387-
case 154 /* ObjectLiteralExpression */:
2387+
case 155 /* ObjectLiteralExpression */:
23882388
result = visitObjectLiteral(context, node);
23892389
break;
2390-
case 145 /* TypeLiteral */:
2390+
case 146 /* TypeLiteral */:
23912391
result = visitTypeLiteral(context, node);
23922392
break;
2393-
case 214 /* ExportAssignment */:
2393+
case 215 /* ExportAssignment */:
23942394
result = visitExportAssignment(context, node);
23952395
break;
2396-
case 203 /* TypeAliasDeclaration */:
2396+
case 204 /* TypeAliasDeclaration */:
23972397
result = visitTypeAliasDeclaration(context, node);
23982398
break;
23992399
}
@@ -2403,7 +2403,7 @@ var td;
24032403
converter.visit = visit;
24042404
function visitBlock(context, node) {
24052405
if (node.statements) {
2406-
var prefered = [201 /* ClassDeclaration */, 202 /* InterfaceDeclaration */, 204 /* EnumDeclaration */];
2406+
var prefered = [202 /* ClassDeclaration */, 203 /* InterfaceDeclaration */, 205 /* EnumDeclaration */];
24072407
var statements = [];
24082408
node.statements.forEach(function (statement) {
24092409
if (prefered.indexOf(statement.kind) != -1) {
@@ -2612,12 +2612,12 @@ var td;
26122612
context.withScope(variable, function () {
26132613
if (node.initializer) {
26142614
switch (node.initializer.kind) {
2615-
case 163 /* ArrowFunction */:
2616-
case 162 /* FunctionExpression */:
2615+
case 164 /* ArrowFunction */:
2616+
case 163 /* FunctionExpression */:
26172617
variable.kind = scope.kind & td.models.ReflectionKind.ClassOrInterface ? td.models.ReflectionKind.Method : td.models.ReflectionKind.Function;
26182618
visitCallSignatureDeclaration(context, node.initializer);
26192619
break;
2620-
case 154 /* ObjectLiteralExpression */:
2620+
case 155 /* ObjectLiteralExpression */:
26212621
if (!isSimpleObjectLiteral(node.initializer)) {
26222622
variable.kind = td.models.ReflectionKind.ObjectLiteral;
26232623
variable.type = new td.models.IntrinsicType('object');
@@ -2908,11 +2908,11 @@ var td;
29082908
switch (node.kind) {
29092909
case 8 /* StringLiteral */:
29102910
return convertStringLiteralExpression(node);
2911-
case 146 /* ArrayType */:
2911+
case 147 /* ArrayType */:
29122912
return convertArrayTypeNode(context, node);
2913-
case 147 /* TupleType */:
2913+
case 148 /* TupleType */:
29142914
return convertTupleTypeNode(context, node);
2915-
case 148 /* UnionType */:
2915+
case 149 /* UnionType */:
29162916
return convertUnionTypeNode(context, node);
29172917
}
29182918
// Node based type conversions by type flags
@@ -3329,7 +3329,7 @@ var td;
33293329
* @returns The type reflection representing the given binding pattern.
33303330
*/
33313331
function convertDestructuringType(context, node) {
3332-
if (node.kind == 151 /* ArrayBindingPattern */) {
3332+
if (node.kind == 152 /* ArrayBindingPattern */) {
33333333
var types = [];
33343334
node.elements.forEach(function (element) {
33353335
types.push(convertType(context, element));
@@ -3768,7 +3768,7 @@ var td;
37683768
}
37693769
// Test whether the node is exported
37703770
var isExported = container.kindOf(td.models.ReflectionKind.Module) ? false : container.flags.isExported;
3771-
if (node.parent && node.parent.kind == 199 /* VariableDeclarationList */) {
3771+
if (node.parent && node.parent.kind == 200 /* VariableDeclarationList */) {
37723772
isExported = isExported || !!(node.parent.parent.flags & 1 /* Export */);
37733773
}
37743774
else {
@@ -3788,10 +3788,10 @@ var td;
37883788
if (nonStaticKinds.indexOf(kind) == -1) {
37893789
isStatic = !!(node.flags & 128 /* Static */);
37903790
if (container.kind == td.models.ReflectionKind.Class) {
3791-
if (node.parent && node.parent.kind == 135 /* Constructor */) {
3791+
if (node.parent && node.parent.kind == 136 /* Constructor */) {
37923792
isConstructorProperty = true;
37933793
}
3794-
else if (!node.parent || node.parent.kind != 201 /* ClassDeclaration */) {
3794+
else if (!node.parent || node.parent.kind != 202 /* ClassDeclaration */) {
37953795
isStatic = true;
37963796
}
37973797
}
@@ -3938,7 +3938,7 @@ var td;
39383938
*/
39393939
function extractSignatureType(context, node) {
39403940
var checker = context.checker;
3941-
if (node.kind & 138 /* CallSignature */ || node.kind & 157 /* CallExpression */) {
3941+
if (node.kind & 139 /* CallSignature */ || node.kind & 158 /* CallExpression */) {
39423942
try {
39433943
var signature = checker.getSignatureFromDeclaration(node);
39443944
return converter.convertType(context, node.type, checker.getReturnTypeOfSignature(signature));
@@ -4239,18 +4239,18 @@ var td;
42394239
CommentPlugin.getComment = function (node) {
42404240
var sourceFile = ts.getSourceFileOfNode(node);
42414241
var target = node;
4242-
if (node.kind == 205 /* ModuleDeclaration */) {
4242+
if (node.kind == 206 /* ModuleDeclaration */) {
42434243
var a, b;
42444244
// Ignore comments for cascaded modules, e.g. module A.B { }
4245-
if (node.nextContainer && node.nextContainer.kind == 205 /* ModuleDeclaration */) {
4245+
if (node.nextContainer && node.nextContainer.kind == 206 /* ModuleDeclaration */) {
42464246
a = node;
42474247
b = node.nextContainer;
42484248
if (a.name.end + 1 == b.name.pos) {
42494249
return null;
42504250
}
42514251
}
42524252
// Pull back comments of cascaded modules
4253-
while (target.parent && target.parent.kind == 205 /* ModuleDeclaration */) {
4253+
while (target.parent && target.parent.kind == 206 /* ModuleDeclaration */) {
42544254
a = target;
42554255
b = target.parent;
42564256
if (a.name.pos == b.name.end + 1) {
@@ -4261,13 +4261,13 @@ var td;
42614261
}
42624262
}
42634263
}
4264-
if (node.parent && node.parent.kind == 199 /* VariableDeclarationList */) {
4264+
if (node.parent && node.parent.kind == 200 /* VariableDeclarationList */) {
42654265
target = node.parent.parent;
42664266
}
42674267
var comments = ts.getJsDocComments(target, sourceFile);
42684268
if (comments && comments.length) {
42694269
var comment;
4270-
if (node.kind == 227 /* 'SourceFile' */) {
4270+
if (node.kind == 228 /* 'SourceFile' */) {
42714271
if (comments.length == 1)
42724272
return null;
42734273
comment = comments[0];
@@ -4506,7 +4506,7 @@ var td;
45064506
case 65 /* Identifier */:
45074507
identifier = decorator.expression;
45084508
break;
4509-
case 157 /* CallExpression */:
4509+
case 158 /* CallExpression */:
45104510
callExpression = decorator.expression;
45114511
identifier = callExpression.expression;
45124512
break;

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
"node": ">=0.10.0"
2929
},
3030
"dependencies": {
31-
"typescript": "1.5.0-beta",
31+
"typescript": "1.5.3",
3232
"typedoc-default-themes": "0.3.4",
3333
"fs-extra": "^0.22.1",
34-
"minimatch": "^2.0.8",
34+
"minimatch": "^2.0.10",
3535
"handlebars": "3.0.3",
3636
"marked": "^0.3.3",
3737
"highlight.js": "^8.6.0",
@@ -43,7 +43,7 @@
4343
"grunt-contrib-clean": "^0.6.0",
4444
"grunt-contrib-watch": "~0.6.1",
4545
"grunt-string-replace": "^1.2.0",
46-
"grunt-ts": "^4.2.0-beta",
46+
"grunt-ts": "^4.2.0",
4747
"grunt-mocha-istanbul": "^2.4.0",
4848
"istanbul": "^0.3.17",
4949
"mocha": "^2.2.5"

0 commit comments

Comments
 (0)