Skip to content

Commit 55e13e9

Browse files
Bump version to 4.5.5 and LKG
1 parent c5ce170 commit 55e13e9

File tree

8 files changed

+235
-206
lines changed

8 files changed

+235
-206
lines changed

lib/tsc.js

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
6969
var ts;
7070
(function (ts) {
7171
ts.versionMajorMinor = "4.5";
72-
ts.version = "4.5.4";
72+
ts.version = "4.5.5";
7373
var NativeCollections;
7474
(function (NativeCollections) {
7575
function tryGetNativeMap() {
@@ -12247,7 +12247,7 @@ var ts;
1224712247
}
1224812248
ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
1224912249
function getExternalModuleRequireArgument(node) {
12250-
return isRequireVariableDeclaration(node) && getLeftmostAccessExpression(node.initializer).arguments[0];
12250+
return isVariableDeclarationInitializedToBareOrAccessedRequire(node) && getLeftmostAccessExpression(node.initializer).arguments[0];
1225112251
}
1225212252
ts.getExternalModuleRequireArgument = getExternalModuleRequireArgument;
1225312253
function isInternalModuleImportEqualsDeclaration(node) {
@@ -12301,17 +12301,26 @@ var ts;
1230112301
return !requireStringLiteralLikeArgument || ts.isStringLiteralLike(arg);
1230212302
}
1230312303
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) {
1230512313
if (node.kind === 202) {
1230612314
node = node.parent.parent;
1230712315
}
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);
1230912319
}
12310-
ts.isRequireVariableDeclaration = isRequireVariableDeclaration;
1231112320
function isRequireVariableStatement(node) {
1231212321
return ts.isVariableStatement(node)
1231312322
&& 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); });
1231512324
}
1231612325
ts.isRequireVariableStatement = isRequireVariableStatement;
1231712326
function isSingleOrDoubleQuote(charCode) {
@@ -37770,7 +37779,7 @@ var ts;
3777037779
checkStrictModeEvalOrArguments(node, node.name);
3777137780
}
3777237781
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)) {
3777437783
declareSymbolAndAddToSymbolTable(node, 2097152, 2097152);
3777537784
}
3777637785
else if (ts.isBlockOrCatchScoped(node)) {
@@ -40045,7 +40054,7 @@ var ts;
4004540054
&& isAliasableOrJsExpression(node.parent.right)
4004640055
|| node.kind === 295
4004740056
|| node.kind === 294 && isAliasableOrJsExpression(node.initializer)
40048-
|| ts.isRequireVariableDeclaration(node);
40057+
|| ts.isVariableDeclarationInitializedToBareOrAccessedRequire(node);
4004940058
}
4005040059
function isAliasableOrJsExpression(e) {
4005140060
return ts.isAliasableExpression(e) || ts.isFunctionExpression(e) && isJSConstructor(e);
@@ -40901,7 +40910,7 @@ var ts;
4090140910
if (!sigs || !sigs.length) {
4090240911
sigs = getSignaturesOfStructuredType(type, 1);
4090340912
}
40904-
if ((sigs && sigs.length) || getPropertyOfType(type, "default")) {
40913+
if ((sigs && sigs.length) || getPropertyOfType(type, "default", true)) {
4090540914
var moduleType = getTypeWithSyntheticDefaultImportType(type, symbol, moduleSymbol, reference);
4090640915
return cloneTypeAsModuleType(symbol, moduleType, referenceParent);
4090740916
}
@@ -67235,7 +67244,7 @@ var ts;
6723567244
return;
6723667245
}
6723767246
var symbol = getSymbolOfNode(node);
67238-
if (symbol.flags & 2097152 && ts.isRequireVariableDeclaration(node)) {
67247+
if (symbol.flags & 2097152 && ts.isVariableDeclarationInitializedToBareOrAccessedRequire(node)) {
6723967248
checkAliasSymbol(node);
6724067249
return;
6724167250
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy