Skip to content

🤖 Pick PR #46156 (Modify synthetic default generation...) into release-4.5 #46162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
typescript-bot wants to merge 2 commits into from
Closed

🤖 Pick PR #46156 (Modify synthetic default generation...) into release-4.5 #46162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1444688
Cherry-pick PR #46156 into release-4.5
weswigham Oct 1, 2021
ecc9086
Update LKG
typescript-bot Oct 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 20 additions & 7 deletions lib/tsc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39955,7 +39955,20 @@ var ts;
function isSyntacticDefault(node) {
return ((ts.isExportAssignment(node) && !node.isExportEquals) || ts.hasSyntacticModifier(node, 512) || ts.isExportSpecifier(node));
}
function canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias) {
function getUsageModeForExpression(usage) {
return ts.isStringLiteralLike(usage) ? ts.getModeForUsageLocation(ts.getSourceFileOfNode(usage), usage) : undefined;
}
function isESMFormatImportImportingCommonjsFormatFile(usageMode, targetMode) {
return usageMode === ts.ModuleKind.ESNext && targetMode === ts.ModuleKind.CommonJS;
}
function canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, usage) {
var usageMode = file && getUsageModeForExpression(usage);
if (file && usageMode !== undefined) {
var result = isESMFormatImportImportingCommonjsFormatFile(usageMode, file.impliedNodeFormat);
if (usageMode === ts.ModuleKind.ESNext || result) {
return result;
}
}
if (!allowSyntheticDefaultImports) {
return false;
}
Expand Down Expand Up @@ -39986,7 +39999,7 @@ var ts;
exportDefaultSymbol = resolveExportByName(moduleSymbol, "default", node, dontResolveAlias);
}
var file = (_a = moduleSymbol.declarations) === null || _a === void 0 ? void 0 : _a.find(ts.isSourceFile);
var hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias);
var hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, node.parent.moduleSpecifier);
if (!exportDefaultSymbol && !hasSyntheticDefault) {
if (hasExportAssignmentSymbol(moduleSymbol)) {
var compilerOptionName = moduleKind >= ts.ModuleKind.ES2015 ? "allowSyntheticDefaultImports" : "esModuleInterop";
Expand Down Expand Up @@ -40105,7 +40118,7 @@ var ts;
var symbolFromModule = getExportOfModule(targetSymbol, name, specifier, dontResolveAlias);
if (symbolFromModule === undefined && name.escapedText === "default") {
var file = (_a = moduleSymbol.declarations) === null || _a === void 0 ? void 0 : _a.find(ts.isSourceFile);
if (canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias)) {
if (canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, moduleSpecifier)) {
symbolFromModule = resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias) || resolveSymbol(moduleSymbol, dontResolveAlias);
}
}
Expand Down Expand Up @@ -40714,7 +40727,7 @@ var ts;
sigs = getSignaturesOfStructuredType(type, 1);
}
if (sigs && sigs.length) {
var moduleType = getTypeWithSyntheticDefaultImportType(type, symbol, moduleSymbol);
var moduleType = getTypeWithSyntheticDefaultImportType(type, symbol, moduleSymbol, ts.isImportCall(referenceParent) ? referenceParent.arguments[0] : referenceParent.moduleSpecifier);
var result = createSymbol(symbol.flags, symbol.escapedName);
result.declarations = symbol.declarations ? symbol.declarations.slice() : [];
result.parent = symbol.parent;
Expand Down Expand Up @@ -62490,18 +62503,18 @@ var ts;
if (moduleSymbol) {
var esModuleSymbol = resolveESModuleSymbol(moduleSymbol, specifier, true, false);
if (esModuleSymbol) {
return createPromiseReturnType(node, getTypeWithSyntheticDefaultImportType(getTypeOfSymbol(esModuleSymbol), esModuleSymbol, moduleSymbol));
return createPromiseReturnType(node, getTypeWithSyntheticDefaultImportType(getTypeOfSymbol(esModuleSymbol), esModuleSymbol, moduleSymbol, specifier));
}
}
return createPromiseReturnType(node, anyType);
}
function getTypeWithSyntheticDefaultImportType(type, symbol, originalSymbol) {
function getTypeWithSyntheticDefaultImportType(type, symbol, originalSymbol, moduleSpecifier) {
var _a;
if (allowSyntheticDefaultImports && type && !isErrorType(type)) {
var synthType = type;
if (!synthType.syntheticType) {
var file = (_a = originalSymbol.declarations) === null || _a === void 0 ? void 0 : _a.find(ts.isSourceFile);
var hasSyntheticDefault = canHaveSyntheticDefault(file, originalSymbol, false);
var hasSyntheticDefault = canHaveSyntheticDefault(file, originalSymbol, false, moduleSpecifier);
if (hasSyntheticDefault) {
var memberTable = ts.createSymbolTable();
var newSymbol = createSymbol(2097152, "default");
Expand Down
28 changes: 21 additions & 7 deletions lib/tsserver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48709,7 +48709,21 @@ var ts;
function isSyntacticDefault(node) {
return ((ts.isExportAssignment(node) && !node.isExportEquals) || ts.hasSyntacticModifier(node, 512 /* Default */) || ts.isExportSpecifier(node));
}
function canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias) {
function getUsageModeForExpression(usage) {
return ts.isStringLiteralLike(usage) ? ts.getModeForUsageLocation(ts.getSourceFileOfNode(usage), usage) : undefined;
}
function isESMFormatImportImportingCommonjsFormatFile(usageMode, targetMode) {
return usageMode === ts.ModuleKind.ESNext && targetMode === ts.ModuleKind.CommonJS;
}
function canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, usage) {
var usageMode = file && getUsageModeForExpression(usage);
if (file && usageMode !== undefined) {
var result = isESMFormatImportImportingCommonjsFormatFile(usageMode, file.impliedNodeFormat);
if (usageMode === ts.ModuleKind.ESNext || result) {
return result;
}
// fallthrough on cjs usages so we imply defaults for interop'd imports, too
}
if (!allowSyntheticDefaultImports) {
return false;
}
Expand Down Expand Up @@ -48751,7 +48765,7 @@ var ts;
exportDefaultSymbol = resolveExportByName(moduleSymbol, "default" /* Default */, node, dontResolveAlias);
}
var file = (_a = moduleSymbol.declarations) === null || _a === void 0 ? void 0 : _a.find(ts.isSourceFile);
var hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias);
var hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, node.parent.moduleSpecifier);
if (!exportDefaultSymbol && !hasSyntheticDefault) {
if (hasExportAssignmentSymbol(moduleSymbol)) {
var compilerOptionName = moduleKind >= ts.ModuleKind.ES2015 ? "allowSyntheticDefaultImports" : "esModuleInterop";
Expand Down Expand Up @@ -48891,7 +48905,7 @@ var ts;
var symbolFromModule = getExportOfModule(targetSymbol, name, specifier, dontResolveAlias);
if (symbolFromModule === undefined && name.escapedText === "default" /* Default */) {
var file = (_a = moduleSymbol.declarations) === null || _a === void 0 ? void 0 : _a.find(ts.isSourceFile);
if (canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias)) {
if (canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, moduleSpecifier)) {
symbolFromModule = resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias) || resolveSymbol(moduleSymbol, dontResolveAlias);
}
}
Expand Down Expand Up @@ -49582,7 +49596,7 @@ var ts;
sigs = getSignaturesOfStructuredType(type, 1 /* Construct */);
}
if (sigs && sigs.length) {
var moduleType = getTypeWithSyntheticDefaultImportType(type, symbol, moduleSymbol);
var moduleType = getTypeWithSyntheticDefaultImportType(type, symbol, moduleSymbol, ts.isImportCall(referenceParent) ? referenceParent.arguments[0] : referenceParent.moduleSpecifier);
// Create a new symbol which has the module's type less the call and construct signatures
var result = createSymbol(symbol.flags, symbol.escapedName);
result.declarations = symbol.declarations ? symbol.declarations.slice() : [];
Expand Down Expand Up @@ -74759,18 +74773,18 @@ var ts;
if (moduleSymbol) {
var esModuleSymbol = resolveESModuleSymbol(moduleSymbol, specifier, /*dontRecursivelyResolve*/ true, /*suppressUsageError*/ false);
if (esModuleSymbol) {
return createPromiseReturnType(node, getTypeWithSyntheticDefaultImportType(getTypeOfSymbol(esModuleSymbol), esModuleSymbol, moduleSymbol));
return createPromiseReturnType(node, getTypeWithSyntheticDefaultImportType(getTypeOfSymbol(esModuleSymbol), esModuleSymbol, moduleSymbol, specifier));
}
}
return createPromiseReturnType(node, anyType);
}
function getTypeWithSyntheticDefaultImportType(type, symbol, originalSymbol) {
function getTypeWithSyntheticDefaultImportType(type, symbol, originalSymbol, moduleSpecifier) {
var _a;
if (allowSyntheticDefaultImports && type && !isErrorType(type)) {
var synthType = type;
if (!synthType.syntheticType) {
var file = (_a = originalSymbol.declarations) === null || _a === void 0 ? void 0 : _a.find(ts.isSourceFile);
var hasSyntheticDefault = canHaveSyntheticDefault(file, originalSymbol, /*dontResolveAlias*/ false);
var hasSyntheticDefault = canHaveSyntheticDefault(file, originalSymbol, /*dontResolveAlias*/ false, moduleSpecifier);
if (hasSyntheticDefault) {
var memberTable = ts.createSymbolTable();
var newSymbol = createSymbol(2097152 /* Alias */, "default" /* Default */);
Expand Down
28 changes: 21 additions & 7 deletions lib/tsserverlibrary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48903,7 +48903,21 @@ var ts;
function isSyntacticDefault(node) {
return ((ts.isExportAssignment(node) && !node.isExportEquals) || ts.hasSyntacticModifier(node, 512 /* Default */) || ts.isExportSpecifier(node));
}
function canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias) {
function getUsageModeForExpression(usage) {
return ts.isStringLiteralLike(usage) ? ts.getModeForUsageLocation(ts.getSourceFileOfNode(usage), usage) : undefined;
}
function isESMFormatImportImportingCommonjsFormatFile(usageMode, targetMode) {
return usageMode === ts.ModuleKind.ESNext && targetMode === ts.ModuleKind.CommonJS;
}
function canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, usage) {
var usageMode = file && getUsageModeForExpression(usage);
if (file && usageMode !== undefined) {
var result = isESMFormatImportImportingCommonjsFormatFile(usageMode, file.impliedNodeFormat);
if (usageMode === ts.ModuleKind.ESNext || result) {
return result;
}
// fallthrough on cjs usages so we imply defaults for interop'd imports, too
}
if (!allowSyntheticDefaultImports) {
return false;
}
Expand Down Expand Up @@ -48945,7 +48959,7 @@ var ts;
exportDefaultSymbol = resolveExportByName(moduleSymbol, "default" /* Default */, node, dontResolveAlias);
}
var file = (_a = moduleSymbol.declarations) === null || _a === void 0 ? void 0 : _a.find(ts.isSourceFile);
var hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias);
var hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, node.parent.moduleSpecifier);
if (!exportDefaultSymbol && !hasSyntheticDefault) {
if (hasExportAssignmentSymbol(moduleSymbol)) {
var compilerOptionName = moduleKind >= ts.ModuleKind.ES2015 ? "allowSyntheticDefaultImports" : "esModuleInterop";
Expand Down Expand Up @@ -49085,7 +49099,7 @@ var ts;
var symbolFromModule = getExportOfModule(targetSymbol, name, specifier, dontResolveAlias);
if (symbolFromModule === undefined && name.escapedText === "default" /* Default */) {
var file = (_a = moduleSymbol.declarations) === null || _a === void 0 ? void 0 : _a.find(ts.isSourceFile);
if (canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias)) {
if (canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, moduleSpecifier)) {
symbolFromModule = resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias) || resolveSymbol(moduleSymbol, dontResolveAlias);
}
}
Expand Down Expand Up @@ -49776,7 +49790,7 @@ var ts;
sigs = getSignaturesOfStructuredType(type, 1 /* Construct */);
}
if (sigs && sigs.length) {
var moduleType = getTypeWithSyntheticDefaultImportType(type, symbol, moduleSymbol);
var moduleType = getTypeWithSyntheticDefaultImportType(type, symbol, moduleSymbol, ts.isImportCall(referenceParent) ? referenceParent.arguments[0] : referenceParent.moduleSpecifier);
// Create a new symbol which has the module's type less the call and construct signatures
var result = createSymbol(symbol.flags, symbol.escapedName);
result.declarations = symbol.declarations ? symbol.declarations.slice() : [];
Expand Down Expand Up @@ -74953,18 +74967,18 @@ var ts;
if (moduleSymbol) {
var esModuleSymbol = resolveESModuleSymbol(moduleSymbol, specifier, /*dontRecursivelyResolve*/ true, /*suppressUsageError*/ false);
if (esModuleSymbol) {
return createPromiseReturnType(node, getTypeWithSyntheticDefaultImportType(getTypeOfSymbol(esModuleSymbol), esModuleSymbol, moduleSymbol));
return createPromiseReturnType(node, getTypeWithSyntheticDefaultImportType(getTypeOfSymbol(esModuleSymbol), esModuleSymbol, moduleSymbol, specifier));
}
}
return createPromiseReturnType(node, anyType);
}
function getTypeWithSyntheticDefaultImportType(type, symbol, originalSymbol) {
function getTypeWithSyntheticDefaultImportType(type, symbol, originalSymbol, moduleSpecifier) {
var _a;
if (allowSyntheticDefaultImports && type && !isErrorType(type)) {
var synthType = type;
if (!synthType.syntheticType) {
var file = (_a = originalSymbol.declarations) === null || _a === void 0 ? void 0 : _a.find(ts.isSourceFile);
var hasSyntheticDefault = canHaveSyntheticDefault(file, originalSymbol, /*dontResolveAlias*/ false);
var hasSyntheticDefault = canHaveSyntheticDefault(file, originalSymbol, /*dontResolveAlias*/ false, moduleSpecifier);
if (hasSyntheticDefault) {
var memberTable = ts.createSymbolTable();
var newSymbol = createSymbol(2097152 /* Alias */, "default" /* Default */);
Expand Down
Loading