@@ -67,7 +67,7 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
67
67
var ts;
68
68
(function (ts) {
69
69
ts.versionMajorMinor = "3.6";
70
- ts.version = ts.versionMajorMinor + ".3 ";
70
+ ts.version = ts.versionMajorMinor + ".4 ";
71
71
})(ts || (ts = {}));
72
72
(function (ts) {
73
73
ts.emptyArray = [];
@@ -7282,7 +7282,7 @@ var ts;
7282
7282
}
7283
7283
ts.isEnumConst = isEnumConst;
7284
7284
function isDeclarationReadonly(declaration) {
7285
- return !!(ts.getCombinedModifierFlags(declaration) & 64 && !ts.isParameterPropertyDeclaration(declaration));
7285
+ return !!(ts.getCombinedModifierFlags(declaration) & 64 && !ts.isParameterPropertyDeclaration(declaration, declaration.parent ));
7286
7286
}
7287
7287
ts.isDeclarationReadonly = isDeclarationReadonly;
7288
7288
function isVarConst(node) {
@@ -10525,8 +10525,8 @@ var ts;
10525
10525
}
10526
10526
}
10527
10527
ts.getTypeParameterOwner = getTypeParameterOwner;
10528
- function isParameterPropertyDeclaration(node) {
10529
- return ts.hasModifier(node, 92) && node. parent.kind === 158;
10528
+ function isParameterPropertyDeclaration(node, parent ) {
10529
+ return ts.hasModifier(node, 92) && parent.kind === 158;
10530
10530
}
10531
10531
ts.isParameterPropertyDeclaration = isParameterPropertyDeclaration;
10532
10532
function isEmptyBindingPattern(node) {
@@ -25150,7 +25150,7 @@ var ts;
25150
25150
else {
25151
25151
declareSymbolAndAddToSymbolTable(node, 1, 111551);
25152
25152
}
25153
- if (ts.isParameterPropertyDeclaration(node)) {
25153
+ if (ts.isParameterPropertyDeclaration(node, node.parent )) {
25154
25154
var classDeclaration = node.parent.parent;
25155
25155
declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, 4 | (node.questionToken ? 16777216 : 0), 0);
25156
25156
}
@@ -33247,8 +33247,7 @@ var ts;
33247
33247
return undefined;
33248
33248
}
33249
33249
function getConstraintDeclaration(type) {
33250
- var decl = type.symbol && ts.getDeclarationOfKind(type.symbol, 151);
33251
- return decl && ts.getEffectiveConstraintOfTypeParameter(decl);
33250
+ return ts.mapDefined(ts.filter(type.symbol && type.symbol.declarations, ts.isTypeParameterDeclaration), ts.getEffectiveConstraintOfTypeParameter)[0];
33252
33251
}
33253
33252
function getInferredTypeParameterConstraint(typeParameter) {
33254
33253
var inferences;
@@ -33424,11 +33423,11 @@ var ts;
33424
33423
}
33425
33424
return undefined;
33426
33425
}
33427
- function resolveTypeReferenceName(typeReferenceName, meaning) {
33426
+ function resolveTypeReferenceName(typeReferenceName, meaning, ignoreErrors ) {
33428
33427
if (!typeReferenceName) {
33429
33428
return unknownSymbol;
33430
33429
}
33431
- return resolveEntityName(typeReferenceName, meaning) || unknownSymbol;
33430
+ return resolveEntityName(typeReferenceName, meaning, ignoreErrors ) || unknownSymbol;
33432
33431
}
33433
33432
function getTypeReferenceType(node, symbol) {
33434
33433
var typeArguments = typeArgumentsFromTypeReferenceNode(node);
@@ -33592,7 +33591,16 @@ var ts;
33592
33591
var meaning = 788968;
33593
33592
if (isJSDocTypeReference(node)) {
33594
33593
type = getIntendedTypeFromJSDocTypeReference(node);
33595
- meaning |= 111551;
33594
+ if (!type) {
33595
+ symbol = resolveTypeReferenceName(getTypeReferenceName(node), meaning, true);
33596
+ if (symbol === unknownSymbol) {
33597
+ symbol = resolveTypeReferenceName(getTypeReferenceName(node), meaning | 111551);
33598
+ }
33599
+ else {
33600
+ resolveTypeReferenceName(getTypeReferenceName(node), meaning);
33601
+ }
33602
+ type = getTypeReferenceType(node, symbol);
33603
+ }
33596
33604
}
33597
33605
if (!type) {
33598
33606
symbol = resolveTypeReferenceName(getTypeReferenceName(node), meaning);
@@ -46510,7 +46518,7 @@ var ts;
46510
46518
if (member.kind === 158) {
46511
46519
for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
46512
46520
var param = _c[_b];
46513
- if (ts.isParameterPropertyDeclaration(param) && !ts.isBindingPattern(param.name)) {
46521
+ if (ts.isParameterPropertyDeclaration(param, member ) && !ts.isBindingPattern(param.name)) {
46514
46522
addName(instanceNames, param.name, param.name.escapedText, 3);
46515
46523
}
46516
46524
}
@@ -47816,7 +47824,7 @@ var ts;
47816
47824
var parameter = local.valueDeclaration && tryGetRootParameterDeclaration(local.valueDeclaration);
47817
47825
var name = local.valueDeclaration && ts.getNameOfDeclaration(local.valueDeclaration);
47818
47826
if (parameter && name) {
47819
- if (!ts.isParameterPropertyDeclaration(parameter) && !ts.parameterIsThisKeyword(parameter) && !isIdentifierThatStartsWithUnderscore(name)) {
47827
+ if (!ts.isParameterPropertyDeclaration(parameter, parameter.parent ) && !ts.parameterIsThisKeyword(parameter) && !isIdentifierThatStartsWithUnderscore(name)) {
47820
47828
addDiagnostic(parameter, 1, ts.createDiagnosticForNode(name, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, ts.symbolName(local)));
47821
47829
}
47822
47830
}
@@ -49050,10 +49058,8 @@ var ts;
49050
49058
var constraint = ts.getEffectiveConstraintOfTypeParameter(source);
49051
49059
var sourceConstraint = constraint && getTypeFromTypeNode(constraint);
49052
49060
var targetConstraint = getConstraintOfTypeParameter(target);
49053
- if (sourceConstraint) {
49054
- if (!targetConstraint || !isTypeIdenticalTo(sourceConstraint, targetConstraint)) {
49055
- return false;
49056
- }
49061
+ if (sourceConstraint && targetConstraint && !isTypeIdenticalTo(sourceConstraint, targetConstraint)) {
49062
+ return false;
49057
49063
}
49058
49064
var sourceDefault = source.default && getTypeFromTypeNode(source.default);
49059
49065
var targetDefault = getDefaultFromTypeParameter(target);
@@ -59445,7 +59451,7 @@ var ts;
59445
59451
var members = [];
59446
59452
var constructor = ts.getFirstConstructorWithBody(node);
59447
59453
var parametersWithPropertyAssignments = constructor &&
59448
- ts.filter(constructor.parameters, ts.isParameterPropertyDeclaration);
59454
+ ts.filter(constructor.parameters, function (p) { return ts.isParameterPropertyDeclaration(p, constructor); } );
59449
59455
if (parametersWithPropertyAssignments) {
59450
59456
for (var _i = 0, parametersWithPropertyAssignments_1 = parametersWithPropertyAssignments; _i < parametersWithPropertyAssignments_1.length; _i++) {
59451
59457
var parameter = parametersWithPropertyAssignments_1[_i];
@@ -59989,7 +59995,7 @@ var ts;
59989
59995
}
59990
59996
function transformConstructorBody(body, constructor) {
59991
59997
var parametersWithPropertyAssignments = constructor &&
59992
- ts.filter(constructor.parameters, ts.isParameterPropertyDeclaration);
59998
+ ts.filter(constructor.parameters, function (p) { return ts.isParameterPropertyDeclaration(p, constructor); } );
59993
59999
if (!ts.some(parametersWithPropertyAssignments)) {
59994
60000
return ts.visitFunctionBody(body, visitor, context);
59995
60001
}
@@ -60859,7 +60865,7 @@ var ts;
60859
60865
if (constructor && constructor.body) {
60860
60866
var parameterPropertyDeclarationCount = 0;
60861
60867
for (var i = indexOfFirstStatement; i < constructor.body.statements.length; i++) {
60862
- if (ts.isParameterPropertyDeclaration(ts.getOriginalNode(constructor.body.statements[i]))) {
60868
+ if (ts.isParameterPropertyDeclaration(ts.getOriginalNode(constructor.body.statements[i]), constructor )) {
60863
60869
parameterPropertyDeclarationCount++;
60864
60870
}
60865
60871
else {
@@ -68314,7 +68320,7 @@ var ts;
68314
68320
return getReturnTypeVisibilityError;
68315
68321
}
68316
68322
else if (ts.isParameter(node)) {
68317
- if (ts.isParameterPropertyDeclaration(node) && ts.hasModifier(node.parent, 8)) {
68323
+ if (ts.isParameterPropertyDeclaration(node, node.parent ) && ts.hasModifier(node.parent, 8)) {
68318
68324
return getVariableDeclarationTypeVisibilityError;
68319
68325
}
68320
68326
return getParameterDeclarationTypeVisibilityError;
0 commit comments