@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
69
69
var ts;
70
70
(function (ts) {
71
71
ts.versionMajorMinor = "4.5";
72
- ts.version = "4.5.4 ";
72
+ ts.version = "4.5.5 ";
73
73
var NativeCollections;
74
74
(function (NativeCollections) {
75
75
function tryGetNativeMap() {
@@ -12247,7 +12247,7 @@ var ts;
12247
12247
}
12248
12248
ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
12249
12249
function getExternalModuleRequireArgument(node) {
12250
- return isRequireVariableDeclaration (node) && getLeftmostAccessExpression(node.initializer).arguments[0];
12250
+ return isVariableDeclarationInitializedToBareOrAccessedRequire (node) && getLeftmostAccessExpression(node.initializer).arguments[0];
12251
12251
}
12252
12252
ts.getExternalModuleRequireArgument = getExternalModuleRequireArgument;
12253
12253
function isInternalModuleImportEqualsDeclaration(node) {
@@ -12301,17 +12301,26 @@ var ts;
12301
12301
return !requireStringLiteralLikeArgument || ts.isStringLiteralLike(arg);
12302
12302
}
12303
12303
ts.isRequireCall = isRequireCall;
12304
- function isRequireVariableDeclaration(node) {
12304
+ function isVariableDeclarationInitializedToRequire(node) {
12305
+ return isVariableDeclarationInitializedWithRequireHelper(node, false);
12306
+ }
12307
+ ts.isVariableDeclarationInitializedToRequire = isVariableDeclarationInitializedToRequire;
12308
+ function isVariableDeclarationInitializedToBareOrAccessedRequire(node) {
12309
+ return isVariableDeclarationInitializedWithRequireHelper(node, true);
12310
+ }
12311
+ ts.isVariableDeclarationInitializedToBareOrAccessedRequire = isVariableDeclarationInitializedToBareOrAccessedRequire;
12312
+ function isVariableDeclarationInitializedWithRequireHelper(node, allowAccessedRequire) {
12305
12313
if (node.kind === 202) {
12306
12314
node = node.parent.parent;
12307
12315
}
12308
- return ts.isVariableDeclaration(node) && !!node.initializer && isRequireCall(getLeftmostAccessExpression(node.initializer), true);
12316
+ return ts.isVariableDeclaration(node) &&
12317
+ !!node.initializer &&
12318
+ isRequireCall(allowAccessedRequire ? getLeftmostAccessExpression(node.initializer) : node.initializer, true);
12309
12319
}
12310
- ts.isRequireVariableDeclaration = isRequireVariableDeclaration;
12311
12320
function isRequireVariableStatement(node) {
12312
12321
return ts.isVariableStatement(node)
12313
12322
&& node.declarationList.declarations.length > 0
12314
- && ts.every(node.declarationList.declarations, function (decl) { return isRequireVariableDeclaration (decl); });
12323
+ && ts.every(node.declarationList.declarations, function (decl) { return isVariableDeclarationInitializedToRequire (decl); });
12315
12324
}
12316
12325
ts.isRequireVariableStatement = isRequireVariableStatement;
12317
12326
function isSingleOrDoubleQuote(charCode) {
@@ -37770,7 +37779,7 @@ var ts;
37770
37779
checkStrictModeEvalOrArguments(node, node.name);
37771
37780
}
37772
37781
if (!ts.isBindingPattern(node.name)) {
37773
- if (ts.isInJSFile(node) && ts.isRequireVariableDeclaration (node) && !ts.getJSDocTypeTag(node)) {
37782
+ if (ts.isInJSFile(node) && ts.isVariableDeclarationInitializedToBareOrAccessedRequire (node) && !ts.getJSDocTypeTag(node)) {
37774
37783
declareSymbolAndAddToSymbolTable(node, 2097152, 2097152);
37775
37784
}
37776
37785
else if (ts.isBlockOrCatchScoped(node)) {
@@ -40045,7 +40054,7 @@ var ts;
40045
40054
&& isAliasableOrJsExpression(node.parent.right)
40046
40055
|| node.kind === 295
40047
40056
|| node.kind === 294 && isAliasableOrJsExpression(node.initializer)
40048
- || ts.isRequireVariableDeclaration (node);
40057
+ || ts.isVariableDeclarationInitializedToBareOrAccessedRequire (node);
40049
40058
}
40050
40059
function isAliasableOrJsExpression(e) {
40051
40060
return ts.isAliasableExpression(e) || ts.isFunctionExpression(e) && isJSConstructor(e);
@@ -40901,7 +40910,7 @@ var ts;
40901
40910
if (!sigs || !sigs.length) {
40902
40911
sigs = getSignaturesOfStructuredType(type, 1);
40903
40912
}
40904
- if ((sigs && sigs.length) || getPropertyOfType(type, "default")) {
40913
+ if ((sigs && sigs.length) || getPropertyOfType(type, "default", true )) {
40905
40914
var moduleType = getTypeWithSyntheticDefaultImportType(type, symbol, moduleSymbol, reference);
40906
40915
return cloneTypeAsModuleType(symbol, moduleType, referenceParent);
40907
40916
}
@@ -67235,7 +67244,7 @@ var ts;
67235
67244
return;
67236
67245
}
67237
67246
var symbol = getSymbolOfNode(node);
67238
- if (symbol.flags & 2097152 && ts.isRequireVariableDeclaration (node)) {
67247
+ if (symbol.flags & 2097152 && ts.isVariableDeclarationInitializedToBareOrAccessedRequire (node)) {
67239
67248
checkAliasSymbol(node);
67240
67249
return;
67241
67250
}
0 commit comments