Skip to content

Commit 3b45f4d

Browse files
typescript-bottypescript-bot
committed
Bump version to 5.0.4 and LKG
1 parent dc7e5a7 commit 3b45f4d

7 files changed

+127
-79
lines changed

‎lib/tsc.js

+26-18
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var __export = (target, all) => {
2323

2424
// src/compiler/corePublic.ts
2525
var versionMajorMinor = "5.0";
26-
var version = "5.0.3";
26+
var version = "5.0.4";
2727

2828
// src/compiler/core.ts
2929
var emptyArray = [];
@@ -16192,6 +16192,9 @@ function getAllowSyntheticDefaultImports(compilerOptions) {
1619216192
function moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution) {
1619316193
return moduleResolution >= 3 /* Node16 */ && moduleResolution <= 99 /* NodeNext */ || moduleResolution === 100 /* Bundler */;
1619416194
}
16195+
function shouldResolveJsRequire(compilerOptions) {
16196+
return !!compilerOptions.noDtsResolution || getEmitModuleResolutionKind(compilerOptions) !== 100 /* Bundler */;
16197+
}
1619516198
function getResolvePackageJsonExports(compilerOptions) {
1619616199
const moduleResolution = getEmitModuleResolutionKind(compilerOptions);
1619716200
if (!moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution)) {
@@ -29242,6 +29245,12 @@ var Parser;
2924229245
if (languageVariant === 1 /* JSX */) {
2924329246
return parseJsxElementOrSelfClosingElementOrFragment(
2924429247
/*inExpressionContext*/
29248+
true,
29249+
/*topInvalidNodePosition*/
29250+
void 0,
29251+
/*openingTag*/
29252+
void 0,
29253+
/*mustBeUnary*/
2924529254
true
2924629255
);
2924729256
}
@@ -29346,7 +29355,7 @@ var Parser;
2934629355
true
2934729356
)), pos);
2934829357
}
29349-
function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext, topInvalidNodePosition, openingTag) {
29358+
function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext, topInvalidNodePosition, openingTag, mustBeUnary = false) {
2935029359
const pos = getNodePos();
2935129360
const opening = parseJsxOpeningOrSelfClosingElementOrOpeningFragment(inExpressionContext);
2935229361
let result;
@@ -29384,7 +29393,7 @@ var Parser;
2938429393
Debug.assert(opening.kind === 282 /* JsxSelfClosingElement */);
2938529394
result = opening;
2938629395
}
29387-
if (inExpressionContext && token() === 29 /* LessThanToken */) {
29396+
if (!mustBeUnary && inExpressionContext && token() === 29 /* LessThanToken */) {
2938829397
const topBadPos = typeof topInvalidNodePosition === "undefined" ? result.pos : topInvalidNodePosition;
2938929398
const invalidElement = tryParse(() => parseJsxElementOrSelfClosingElementOrFragment(
2939029399
/*inExpressionContext*/
@@ -34074,7 +34083,8 @@ var commandOptionsWithoutBuild = [
3407434083
affectsSemanticDiagnostics: true,
3407534084
category: Diagnostics.Modules,
3407634085
description: Diagnostics.Allow_imports_to_include_TypeScript_file_extensions_Requires_moduleResolution_bundler_and_either_noEmit_or_emitDeclarationOnly_to_be_set,
34077-
defaultValueDescription: false
34086+
defaultValueDescription: false,
34087+
transpileOptionValue: void 0
3407834088
},
3407934089
{
3408034090
name: "resolvePackageJsonExports",
@@ -41311,7 +41321,7 @@ function createBinder() {
4131141321
}
4131241322
if (!isBindingPattern(node.name)) {
4131341323
const possibleVariableDecl = node.kind === 257 /* VariableDeclaration */ ? node : node.parent.parent;
41314-
if (isInJSFile(node) && getEmitModuleResolutionKind(options) !== 100 /* Bundler */ && isVariableDeclarationInitializedToBareOrAccessedRequire(possibleVariableDecl) && !getJSDocTypeTag(node) && !(getCombinedModifierFlags(node) & 1 /* Export */)) {
41324+
if (isInJSFile(node) && shouldResolveJsRequire(options) && isVariableDeclarationInitializedToBareOrAccessedRequire(possibleVariableDecl) && !getJSDocTypeTag(node) && !(getCombinedModifierFlags(node) & 1 /* Export */)) {
4131541325
declareSymbolAndAddToSymbolTable(node, 2097152 /* Alias */, 2097152 /* AliasExcludes */);
4131641326
} else if (isBlockOrCatchScoped(node)) {
4131741327
bindBlockScopedDeclaration(node, 2 /* BlockScopedVariable */, 111551 /* BlockScopedVariableExcludes */);
@@ -44849,7 +44859,7 @@ function createTypeChecker(host) {
4484944859
const hasDefaultOnly = isOnlyImportedAsDefault(specifier);
4485044860
const hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, specifier);
4485144861
if (!exportDefaultSymbol && !hasSyntheticDefault && !hasDefaultOnly) {
44852-
if (hasExportAssignmentSymbol(moduleSymbol) && !(getAllowSyntheticDefaultImports(compilerOptions) || getESModuleInterop(compilerOptions))) {
44862+
if (hasExportAssignmentSymbol(moduleSymbol) && !allowSyntheticDefaultImports) {
4485344863
const compilerOptionName = moduleKind >= 5 /* ES2015 */ ? "allowSyntheticDefaultImports" : "esModuleInterop";
4485444864
const exportEqualsSymbol = moduleSymbol.exports.get("export=" /* ExportEquals */);
4485544865
const exportAssignment = exportEqualsSymbol.valueDeclaration;
@@ -45017,7 +45027,7 @@ function createTypeChecker(host) {
4501745027
if (!isIdentifier(name)) {
4501845028
return void 0;
4501945029
}
45020-
const suppressInteropError = name.escapedText === "default" /* Default */ && !!(compilerOptions.allowSyntheticDefaultImports || getESModuleInterop(compilerOptions));
45030+
const suppressInteropError = name.escapedText === "default" /* Default */ && allowSyntheticDefaultImports;
4502145031
const targetSymbol = resolveESModuleSymbol(
4502245032
moduleSymbol,
4502345033
moduleSpecifier,
@@ -49646,7 +49656,7 @@ function createTypeChecker(host) {
4964649656
return;
4964749657
}
4964849658
let verbatimTargetName = isShorthandAmbientModuleSymbol(target) && getSomeTargetNameFromDeclarations(symbol.declarations) || unescapeLeadingUnderscores(target.escapedName);
49649-
if (verbatimTargetName === "export=" /* ExportEquals */ && (getESModuleInterop(compilerOptions) || compilerOptions.allowSyntheticDefaultImports)) {
49659+
if (verbatimTargetName === "export=" /* ExportEquals */ && allowSyntheticDefaultImports) {
4965049660
verbatimTargetName = "default" /* Default */;
4965149661
}
4965249662
const targetName = getInternalSymbolName(target, verbatimTargetName);
@@ -70737,7 +70747,7 @@ function createTypeChecker(host) {
7073770747
return anyType;
7073870748
}
7073970749
}
70740-
if (isInJSFile(node) && getEmitModuleResolutionKind(compilerOptions) !== 100 /* Bundler */ && isCommonJsRequire(node)) {
70750+
if (isInJSFile(node) && shouldResolveJsRequire(compilerOptions) && isCommonJsRequire(node)) {
7074170751
return resolveExternalModuleTypeByLiteral(node.arguments[0]);
7074270752
}
7074370753
const returnType = getReturnTypeOfSignature(signature);
@@ -89240,11 +89250,12 @@ function transformClassFields(context) {
8924089250
return visitEachChild(node, visitor, context);
8924189251
}
8924289252
function visitArrayAssignmentElement(node) {
89243-
Debug.assertNode(node, isArrayBindingOrAssignmentElement);
89244-
if (isSpreadElement(node))
89245-
return visitAssignmentRestElement(node);
89246-
if (!isOmittedExpression(node))
89247-
return visitAssignmentElement(node);
89253+
if (isArrayBindingOrAssignmentElement(node)) {
89254+
if (isSpreadElement(node))
89255+
return visitAssignmentRestElement(node);
89256+
if (!isOmittedExpression(node))
89257+
return visitAssignmentElement(node);
89258+
}
8924889259
return visitEachChild(node, visitor, context);
8924989260
}
8925089261
function visitAssignmentProperty(node) {
@@ -114357,7 +114368,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
114357114368
false
114358114369
);
114359114370
}
114360-
const shouldProcessRequires = isJavaScriptFile && getEmitModuleResolutionKind(options) !== 100 /* Bundler */;
114371+
const shouldProcessRequires = isJavaScriptFile && shouldResolveJsRequire(options);
114361114372
if (file.flags & 2097152 /* PossiblyContainsDynamicImport */ || shouldProcessRequires) {
114362114373
collectDynamicImportOrRequireCalls(file);
114363114374
}
@@ -115285,9 +115296,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
115285115296
if (moduleKind === 2 /* AMD */ || moduleKind === 3 /* UMD */ || moduleKind === 4 /* System */) {
115286115297
createDiagnosticForOptionName(Diagnostics.Option_verbatimModuleSyntax_cannot_be_used_when_module_is_set_to_UMD_AMD_or_System, "verbatimModuleSyntax");
115287115298
}
115288-
if (options.isolatedModules) {
115289-
createRedundantOptionDiagnostic("isolatedModules", "verbatimModuleSyntax");
115290-
}
115291115299
if (options.preserveValueImports) {
115292115300
createRedundantOptionDiagnostic("preserveValueImports", "verbatimModuleSyntax");
115293115301
}

‎lib/tsserver.js

+29-18
Original file line numberDiff line numberDiff line change
@@ -2070,6 +2070,7 @@ __export(server_exports, {
20702070
setValueDeclaration: () => setValueDeclaration,
20712071
shouldAllowImportingTsExtension: () => shouldAllowImportingTsExtension,
20722072
shouldPreserveConstEnums: () => shouldPreserveConstEnums,
2073+
shouldResolveJsRequire: () => shouldResolveJsRequire,
20732074
shouldUseUriStyleNodeCoreModules: () => shouldUseUriStyleNodeCoreModules,
20742075
showModuleSpecifier: () => showModuleSpecifier,
20752076
signatureHasLiteralTypes: () => signatureHasLiteralTypes,
@@ -2286,7 +2287,7 @@ module.exports = __toCommonJS(server_exports);
22862287

22872288
// src/compiler/corePublic.ts
22882289
var versionMajorMinor = "5.0";
2289-
var version = "5.0.3";
2290+
var version = "5.0.4";
22902291
var Comparison = /* @__PURE__ */ ((Comparison3) => {
22912292
Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
22922293
Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -20263,6 +20264,9 @@ function getAllowSyntheticDefaultImports(compilerOptions) {
2026320264
function moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution) {
2026420265
return moduleResolution >= 3 /* Node16 */ && moduleResolution <= 99 /* NodeNext */ || moduleResolution === 100 /* Bundler */;
2026520266
}
20267+
function shouldResolveJsRequire(compilerOptions) {
20268+
return !!compilerOptions.noDtsResolution || getEmitModuleResolutionKind(compilerOptions) !== 100 /* Bundler */;
20269+
}
2026620270
function getResolvePackageJsonExports(compilerOptions) {
2026720271
const moduleResolution = getEmitModuleResolutionKind(compilerOptions);
2026820272
if (!moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution)) {
@@ -33580,6 +33584,12 @@ var Parser;
3358033584
if (languageVariant === 1 /* JSX */) {
3358133585
return parseJsxElementOrSelfClosingElementOrFragment(
3358233586
/*inExpressionContext*/
33587+
true,
33588+
/*topInvalidNodePosition*/
33589+
void 0,
33590+
/*openingTag*/
33591+
void 0,
33592+
/*mustBeUnary*/
3358333593
true
3358433594
);
3358533595
}
@@ -33684,7 +33694,7 @@ var Parser;
3368433694
true
3368533695
)), pos);
3368633696
}
33687-
function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext, topInvalidNodePosition, openingTag) {
33697+
function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext, topInvalidNodePosition, openingTag, mustBeUnary = false) {
3368833698
const pos = getNodePos();
3368933699
const opening = parseJsxOpeningOrSelfClosingElementOrOpeningFragment(inExpressionContext);
3369033700
let result;
@@ -33722,7 +33732,7 @@ var Parser;
3372233732
Debug.assert(opening.kind === 282 /* JsxSelfClosingElement */);
3372333733
result = opening;
3372433734
}
33725-
if (inExpressionContext && token() === 29 /* LessThanToken */) {
33735+
if (!mustBeUnary && inExpressionContext && token() === 29 /* LessThanToken */) {
3372633736
const topBadPos = typeof topInvalidNodePosition === "undefined" ? result.pos : topInvalidNodePosition;
3372733737
const invalidElement = tryParse(() => parseJsxElementOrSelfClosingElementOrFragment(
3372833738
/*inExpressionContext*/
@@ -38412,7 +38422,8 @@ var commandOptionsWithoutBuild = [
3841238422
affectsSemanticDiagnostics: true,
3841338423
category: Diagnostics.Modules,
3841438424
description: Diagnostics.Allow_imports_to_include_TypeScript_file_extensions_Requires_moduleResolution_bundler_and_either_noEmit_or_emitDeclarationOnly_to_be_set,
38415-
defaultValueDescription: false
38425+
defaultValueDescription: false,
38426+
transpileOptionValue: void 0
3841638427
},
3841738428
{
3841838429
name: "resolvePackageJsonExports",
@@ -45862,7 +45873,7 @@ function createBinder() {
4586245873
}
4586345874
if (!isBindingPattern(node.name)) {
4586445875
const possibleVariableDecl = node.kind === 257 /* VariableDeclaration */ ? node : node.parent.parent;
45865-
if (isInJSFile(node) && getEmitModuleResolutionKind(options) !== 100 /* Bundler */ && isVariableDeclarationInitializedToBareOrAccessedRequire(possibleVariableDecl) && !getJSDocTypeTag(node) && !(getCombinedModifierFlags(node) & 1 /* Export */)) {
45876+
if (isInJSFile(node) && shouldResolveJsRequire(options) && isVariableDeclarationInitializedToBareOrAccessedRequire(possibleVariableDecl) && !getJSDocTypeTag(node) && !(getCombinedModifierFlags(node) & 1 /* Export */)) {
4586645877
declareSymbolAndAddToSymbolTable(node, 2097152 /* Alias */, 2097152 /* AliasExcludes */);
4586745878
} else if (isBlockOrCatchScoped(node)) {
4586845879
bindBlockScopedDeclaration(node, 2 /* BlockScopedVariable */, 111551 /* BlockScopedVariableExcludes */);
@@ -49448,7 +49459,7 @@ function createTypeChecker(host) {
4944849459
const hasDefaultOnly = isOnlyImportedAsDefault(specifier);
4944949460
const hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, specifier);
4945049461
if (!exportDefaultSymbol && !hasSyntheticDefault && !hasDefaultOnly) {
49451-
if (hasExportAssignmentSymbol(moduleSymbol) && !(getAllowSyntheticDefaultImports(compilerOptions) || getESModuleInterop(compilerOptions))) {
49462+
if (hasExportAssignmentSymbol(moduleSymbol) && !allowSyntheticDefaultImports) {
4945249463
const compilerOptionName = moduleKind >= 5 /* ES2015 */ ? "allowSyntheticDefaultImports" : "esModuleInterop";
4945349464
const exportEqualsSymbol = moduleSymbol.exports.get("export=" /* ExportEquals */);
4945449465
const exportAssignment = exportEqualsSymbol.valueDeclaration;
@@ -49616,7 +49627,7 @@ function createTypeChecker(host) {
4961649627
if (!isIdentifier(name)) {
4961749628
return void 0;
4961849629
}
49619-
const suppressInteropError = name.escapedText === "default" /* Default */ && !!(compilerOptions.allowSyntheticDefaultImports || getESModuleInterop(compilerOptions));
49630+
const suppressInteropError = name.escapedText === "default" /* Default */ && allowSyntheticDefaultImports;
4962049631
const targetSymbol = resolveESModuleSymbol(
4962149632
moduleSymbol,
4962249633
moduleSpecifier,
@@ -54245,7 +54256,7 @@ function createTypeChecker(host) {
5424554256
return;
5424654257
}
5424754258
let verbatimTargetName = isShorthandAmbientModuleSymbol(target) && getSomeTargetNameFromDeclarations(symbol.declarations) || unescapeLeadingUnderscores(target.escapedName);
54248-
if (verbatimTargetName === "export=" /* ExportEquals */ && (getESModuleInterop(compilerOptions) || compilerOptions.allowSyntheticDefaultImports)) {
54259+
if (verbatimTargetName === "export=" /* ExportEquals */ && allowSyntheticDefaultImports) {
5424954260
verbatimTargetName = "default" /* Default */;
5425054261
}
5425154262
const targetName = getInternalSymbolName(target, verbatimTargetName);
@@ -75336,7 +75347,7 @@ function createTypeChecker(host) {
7533675347
return anyType;
7533775348
}
7533875349
}
75339-
if (isInJSFile(node) && getEmitModuleResolutionKind(compilerOptions) !== 100 /* Bundler */ && isCommonJsRequire(node)) {
75350+
if (isInJSFile(node) && shouldResolveJsRequire(compilerOptions) && isCommonJsRequire(node)) {
7534075351
return resolveExternalModuleTypeByLiteral(node.arguments[0]);
7534175352
}
7534275353
const returnType = getReturnTypeOfSignature(signature);
@@ -94010,11 +94021,12 @@ function transformClassFields(context) {
9401094021
return visitEachChild(node, visitor, context);
9401194022
}
9401294023
function visitArrayAssignmentElement(node) {
94013-
Debug.assertNode(node, isArrayBindingOrAssignmentElement);
94014-
if (isSpreadElement(node))
94015-
return visitAssignmentRestElement(node);
94016-
if (!isOmittedExpression(node))
94017-
return visitAssignmentElement(node);
94024+
if (isArrayBindingOrAssignmentElement(node)) {
94025+
if (isSpreadElement(node))
94026+
return visitAssignmentRestElement(node);
94027+
if (!isOmittedExpression(node))
94028+
return visitAssignmentElement(node);
94029+
}
9401894030
return visitEachChild(node, visitor, context);
9401994031
}
9402094032
function visitAssignmentProperty(node) {
@@ -119192,7 +119204,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
119192119204
false
119193119205
);
119194119206
}
119195-
const shouldProcessRequires = isJavaScriptFile && getEmitModuleResolutionKind(options) !== 100 /* Bundler */;
119207+
const shouldProcessRequires = isJavaScriptFile && shouldResolveJsRequire(options);
119196119208
if (file.flags & 2097152 /* PossiblyContainsDynamicImport */ || shouldProcessRequires) {
119197119209
collectDynamicImportOrRequireCalls(file);
119198119210
}
@@ -120120,9 +120132,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
120120120132
if (moduleKind === 2 /* AMD */ || moduleKind === 3 /* UMD */ || moduleKind === 4 /* System */) {
120121120133
createDiagnosticForOptionName(Diagnostics.Option_verbatimModuleSyntax_cannot_be_used_when_module_is_set_to_UMD_AMD_or_System, "verbatimModuleSyntax");
120122120134
}
120123-
if (options.isolatedModules) {
120124-
createRedundantOptionDiagnostic("isolatedModules", "verbatimModuleSyntax");
120125-
}
120126120135
if (options.preserveValueImports) {
120127120136
createRedundantOptionDiagnostic("preserveValueImports", "verbatimModuleSyntax");
120128120137
}
@@ -169780,6 +169789,7 @@ __export(ts_exports3, {
169780169789
setValueDeclaration: () => setValueDeclaration,
169781169790
shouldAllowImportingTsExtension: () => shouldAllowImportingTsExtension,
169782169791
shouldPreserveConstEnums: () => shouldPreserveConstEnums,
169792+
shouldResolveJsRequire: () => shouldResolveJsRequire,
169783169793
shouldUseUriStyleNodeCoreModules: () => shouldUseUriStyleNodeCoreModules,
169784169794
showModuleSpecifier: () => showModuleSpecifier,
169785169795
signatureHasLiteralTypes: () => signatureHasLiteralTypes,
@@ -183727,6 +183737,7 @@ start(initializeNodeSystem(), require("os").platform());
183727183737
setValueDeclaration,
183728183738
shouldAllowImportingTsExtension,
183729183739
shouldPreserveConstEnums,
183740+
shouldResolveJsRequire,
183730183741
shouldUseUriStyleNodeCoreModules,
183731183742
showModuleSpecifier,
183732183743
signatureHasLiteralTypes,

0 commit comments

Comments
 (0)