typescript 5.0.3 → 5.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/tsc.js +26 -18
- package/lib/tsserver.js +29 -18
- package/lib/tsserverlibrary.js +28 -18
- package/lib/typescript.js +27 -18
- package/lib/typingsInstaller.js +15 -5
- package/package.json +1 -1
package/lib/tsc.js
CHANGED
|
@@ -23,7 +23,7 @@ var __export = (target, all) => {
|
|
|
23
23
|
|
|
24
24
|
// src/compiler/corePublic.ts
|
|
25
25
|
var versionMajorMinor = "5.0";
|
|
26
|
-
var version = "5.0.
|
|
26
|
+
var version = "5.0.4";
|
|
27
27
|
|
|
28
28
|
// src/compiler/core.ts
|
|
29
29
|
var emptyArray = [];
|
|
@@ -16192,6 +16192,9 @@ function getAllowSyntheticDefaultImports(compilerOptions) {
|
|
|
16192
16192
|
function moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution) {
|
|
16193
16193
|
return moduleResolution >= 3 /* Node16 */ && moduleResolution <= 99 /* NodeNext */ || moduleResolution === 100 /* Bundler */;
|
|
16194
16194
|
}
|
|
16195
|
+
function shouldResolveJsRequire(compilerOptions) {
|
|
16196
|
+
return !!compilerOptions.noDtsResolution || getEmitModuleResolutionKind(compilerOptions) !== 100 /* Bundler */;
|
|
16197
|
+
}
|
|
16195
16198
|
function getResolvePackageJsonExports(compilerOptions) {
|
|
16196
16199
|
const moduleResolution = getEmitModuleResolutionKind(compilerOptions);
|
|
16197
16200
|
if (!moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution)) {
|
|
@@ -29242,6 +29245,12 @@ var Parser;
|
|
|
29242
29245
|
if (languageVariant === 1 /* JSX */) {
|
|
29243
29246
|
return parseJsxElementOrSelfClosingElementOrFragment(
|
|
29244
29247
|
/*inExpressionContext*/
|
|
29248
|
+
true,
|
|
29249
|
+
/*topInvalidNodePosition*/
|
|
29250
|
+
void 0,
|
|
29251
|
+
/*openingTag*/
|
|
29252
|
+
void 0,
|
|
29253
|
+
/*mustBeUnary*/
|
|
29245
29254
|
true
|
|
29246
29255
|
);
|
|
29247
29256
|
}
|
|
@@ -29346,7 +29355,7 @@ var Parser;
|
|
|
29346
29355
|
true
|
|
29347
29356
|
)), pos);
|
|
29348
29357
|
}
|
|
29349
|
-
function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext, topInvalidNodePosition, openingTag) {
|
|
29358
|
+
function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext, topInvalidNodePosition, openingTag, mustBeUnary = false) {
|
|
29350
29359
|
const pos = getNodePos();
|
|
29351
29360
|
const opening = parseJsxOpeningOrSelfClosingElementOrOpeningFragment(inExpressionContext);
|
|
29352
29361
|
let result;
|
|
@@ -29384,7 +29393,7 @@ var Parser;
|
|
|
29384
29393
|
Debug.assert(opening.kind === 282 /* JsxSelfClosingElement */);
|
|
29385
29394
|
result = opening;
|
|
29386
29395
|
}
|
|
29387
|
-
if (inExpressionContext && token() === 29 /* LessThanToken */) {
|
|
29396
|
+
if (!mustBeUnary && inExpressionContext && token() === 29 /* LessThanToken */) {
|
|
29388
29397
|
const topBadPos = typeof topInvalidNodePosition === "undefined" ? result.pos : topInvalidNodePosition;
|
|
29389
29398
|
const invalidElement = tryParse(() => parseJsxElementOrSelfClosingElementOrFragment(
|
|
29390
29399
|
/*inExpressionContext*/
|
|
@@ -34074,7 +34083,8 @@ var commandOptionsWithoutBuild = [
|
|
|
34074
34083
|
affectsSemanticDiagnostics: true,
|
|
34075
34084
|
category: Diagnostics.Modules,
|
|
34076
34085
|
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
|
|
34078
34088
|
},
|
|
34079
34089
|
{
|
|
34080
34090
|
name: "resolvePackageJsonExports",
|
|
@@ -41311,7 +41321,7 @@ function createBinder() {
|
|
|
41311
41321
|
}
|
|
41312
41322
|
if (!isBindingPattern(node.name)) {
|
|
41313
41323
|
const possibleVariableDecl = node.kind === 257 /* VariableDeclaration */ ? node : node.parent.parent;
|
|
41314
|
-
if (isInJSFile(node) &&
|
|
41324
|
+
if (isInJSFile(node) && shouldResolveJsRequire(options) && isVariableDeclarationInitializedToBareOrAccessedRequire(possibleVariableDecl) && !getJSDocTypeTag(node) && !(getCombinedModifierFlags(node) & 1 /* Export */)) {
|
|
41315
41325
|
declareSymbolAndAddToSymbolTable(node, 2097152 /* Alias */, 2097152 /* AliasExcludes */);
|
|
41316
41326
|
} else if (isBlockOrCatchScoped(node)) {
|
|
41317
41327
|
bindBlockScopedDeclaration(node, 2 /* BlockScopedVariable */, 111551 /* BlockScopedVariableExcludes */);
|
|
@@ -44849,7 +44859,7 @@ function createTypeChecker(host) {
|
|
|
44849
44859
|
const hasDefaultOnly = isOnlyImportedAsDefault(specifier);
|
|
44850
44860
|
const hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, specifier);
|
|
44851
44861
|
if (!exportDefaultSymbol && !hasSyntheticDefault && !hasDefaultOnly) {
|
|
44852
|
-
if (hasExportAssignmentSymbol(moduleSymbol) && !
|
|
44862
|
+
if (hasExportAssignmentSymbol(moduleSymbol) && !allowSyntheticDefaultImports) {
|
|
44853
44863
|
const compilerOptionName = moduleKind >= 5 /* ES2015 */ ? "allowSyntheticDefaultImports" : "esModuleInterop";
|
|
44854
44864
|
const exportEqualsSymbol = moduleSymbol.exports.get("export=" /* ExportEquals */);
|
|
44855
44865
|
const exportAssignment = exportEqualsSymbol.valueDeclaration;
|
|
@@ -45017,7 +45027,7 @@ function createTypeChecker(host) {
|
|
|
45017
45027
|
if (!isIdentifier(name)) {
|
|
45018
45028
|
return void 0;
|
|
45019
45029
|
}
|
|
45020
|
-
const suppressInteropError = name.escapedText === "default" /* Default */ &&
|
|
45030
|
+
const suppressInteropError = name.escapedText === "default" /* Default */ && allowSyntheticDefaultImports;
|
|
45021
45031
|
const targetSymbol = resolveESModuleSymbol(
|
|
45022
45032
|
moduleSymbol,
|
|
45023
45033
|
moduleSpecifier,
|
|
@@ -49646,7 +49656,7 @@ function createTypeChecker(host) {
|
|
|
49646
49656
|
return;
|
|
49647
49657
|
}
|
|
49648
49658
|
let verbatimTargetName = isShorthandAmbientModuleSymbol(target) && getSomeTargetNameFromDeclarations(symbol.declarations) || unescapeLeadingUnderscores(target.escapedName);
|
|
49649
|
-
if (verbatimTargetName === "export=" /* ExportEquals */ &&
|
|
49659
|
+
if (verbatimTargetName === "export=" /* ExportEquals */ && allowSyntheticDefaultImports) {
|
|
49650
49660
|
verbatimTargetName = "default" /* Default */;
|
|
49651
49661
|
}
|
|
49652
49662
|
const targetName = getInternalSymbolName(target, verbatimTargetName);
|
|
@@ -70737,7 +70747,7 @@ function createTypeChecker(host) {
|
|
|
70737
70747
|
return anyType;
|
|
70738
70748
|
}
|
|
70739
70749
|
}
|
|
70740
|
-
if (isInJSFile(node) &&
|
|
70750
|
+
if (isInJSFile(node) && shouldResolveJsRequire(compilerOptions) && isCommonJsRequire(node)) {
|
|
70741
70751
|
return resolveExternalModuleTypeByLiteral(node.arguments[0]);
|
|
70742
70752
|
}
|
|
70743
70753
|
const returnType = getReturnTypeOfSignature(signature);
|
|
@@ -89240,11 +89250,12 @@ function transformClassFields(context) {
|
|
|
89240
89250
|
return visitEachChild(node, visitor, context);
|
|
89241
89251
|
}
|
|
89242
89252
|
function visitArrayAssignmentElement(node) {
|
|
89243
|
-
|
|
89244
|
-
|
|
89245
|
-
|
|
89246
|
-
|
|
89247
|
-
|
|
89253
|
+
if (isArrayBindingOrAssignmentElement(node)) {
|
|
89254
|
+
if (isSpreadElement(node))
|
|
89255
|
+
return visitAssignmentRestElement(node);
|
|
89256
|
+
if (!isOmittedExpression(node))
|
|
89257
|
+
return visitAssignmentElement(node);
|
|
89258
|
+
}
|
|
89248
89259
|
return visitEachChild(node, visitor, context);
|
|
89249
89260
|
}
|
|
89250
89261
|
function visitAssignmentProperty(node) {
|
|
@@ -114357,7 +114368,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
|
|
|
114357
114368
|
false
|
|
114358
114369
|
);
|
|
114359
114370
|
}
|
|
114360
|
-
const shouldProcessRequires = isJavaScriptFile &&
|
|
114371
|
+
const shouldProcessRequires = isJavaScriptFile && shouldResolveJsRequire(options);
|
|
114361
114372
|
if (file.flags & 2097152 /* PossiblyContainsDynamicImport */ || shouldProcessRequires) {
|
|
114362
114373
|
collectDynamicImportOrRequireCalls(file);
|
|
114363
114374
|
}
|
|
@@ -115285,9 +115296,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
|
|
|
115285
115296
|
if (moduleKind === 2 /* AMD */ || moduleKind === 3 /* UMD */ || moduleKind === 4 /* System */) {
|
|
115286
115297
|
createDiagnosticForOptionName(Diagnostics.Option_verbatimModuleSyntax_cannot_be_used_when_module_is_set_to_UMD_AMD_or_System, "verbatimModuleSyntax");
|
|
115287
115298
|
}
|
|
115288
|
-
if (options.isolatedModules) {
|
|
115289
|
-
createRedundantOptionDiagnostic("isolatedModules", "verbatimModuleSyntax");
|
|
115290
|
-
}
|
|
115291
115299
|
if (options.preserveValueImports) {
|
|
115292
115300
|
createRedundantOptionDiagnostic("preserveValueImports", "verbatimModuleSyntax");
|
|
115293
115301
|
}
|
package/lib/tsserver.js
CHANGED
|
@@ -2070,6 +2070,7 @@ __export(server_exports, {
|
|
|
2070
2070
|
setValueDeclaration: () => setValueDeclaration,
|
|
2071
2071
|
shouldAllowImportingTsExtension: () => shouldAllowImportingTsExtension,
|
|
2072
2072
|
shouldPreserveConstEnums: () => shouldPreserveConstEnums,
|
|
2073
|
+
shouldResolveJsRequire: () => shouldResolveJsRequire,
|
|
2073
2074
|
shouldUseUriStyleNodeCoreModules: () => shouldUseUriStyleNodeCoreModules,
|
|
2074
2075
|
showModuleSpecifier: () => showModuleSpecifier,
|
|
2075
2076
|
signatureHasLiteralTypes: () => signatureHasLiteralTypes,
|
|
@@ -2286,7 +2287,7 @@ module.exports = __toCommonJS(server_exports);
|
|
|
2286
2287
|
|
|
2287
2288
|
// src/compiler/corePublic.ts
|
|
2288
2289
|
var versionMajorMinor = "5.0";
|
|
2289
|
-
var version = "5.0.
|
|
2290
|
+
var version = "5.0.4";
|
|
2290
2291
|
var Comparison = /* @__PURE__ */ ((Comparison3) => {
|
|
2291
2292
|
Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
|
|
2292
2293
|
Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
|
|
@@ -20263,6 +20264,9 @@ function getAllowSyntheticDefaultImports(compilerOptions) {
|
|
|
20263
20264
|
function moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution) {
|
|
20264
20265
|
return moduleResolution >= 3 /* Node16 */ && moduleResolution <= 99 /* NodeNext */ || moduleResolution === 100 /* Bundler */;
|
|
20265
20266
|
}
|
|
20267
|
+
function shouldResolveJsRequire(compilerOptions) {
|
|
20268
|
+
return !!compilerOptions.noDtsResolution || getEmitModuleResolutionKind(compilerOptions) !== 100 /* Bundler */;
|
|
20269
|
+
}
|
|
20266
20270
|
function getResolvePackageJsonExports(compilerOptions) {
|
|
20267
20271
|
const moduleResolution = getEmitModuleResolutionKind(compilerOptions);
|
|
20268
20272
|
if (!moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution)) {
|
|
@@ -33580,6 +33584,12 @@ var Parser;
|
|
|
33580
33584
|
if (languageVariant === 1 /* JSX */) {
|
|
33581
33585
|
return parseJsxElementOrSelfClosingElementOrFragment(
|
|
33582
33586
|
/*inExpressionContext*/
|
|
33587
|
+
true,
|
|
33588
|
+
/*topInvalidNodePosition*/
|
|
33589
|
+
void 0,
|
|
33590
|
+
/*openingTag*/
|
|
33591
|
+
void 0,
|
|
33592
|
+
/*mustBeUnary*/
|
|
33583
33593
|
true
|
|
33584
33594
|
);
|
|
33585
33595
|
}
|
|
@@ -33684,7 +33694,7 @@ var Parser;
|
|
|
33684
33694
|
true
|
|
33685
33695
|
)), pos);
|
|
33686
33696
|
}
|
|
33687
|
-
function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext, topInvalidNodePosition, openingTag) {
|
|
33697
|
+
function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext, topInvalidNodePosition, openingTag, mustBeUnary = false) {
|
|
33688
33698
|
const pos = getNodePos();
|
|
33689
33699
|
const opening = parseJsxOpeningOrSelfClosingElementOrOpeningFragment(inExpressionContext);
|
|
33690
33700
|
let result;
|
|
@@ -33722,7 +33732,7 @@ var Parser;
|
|
|
33722
33732
|
Debug.assert(opening.kind === 282 /* JsxSelfClosingElement */);
|
|
33723
33733
|
result = opening;
|
|
33724
33734
|
}
|
|
33725
|
-
if (inExpressionContext && token() === 29 /* LessThanToken */) {
|
|
33735
|
+
if (!mustBeUnary && inExpressionContext && token() === 29 /* LessThanToken */) {
|
|
33726
33736
|
const topBadPos = typeof topInvalidNodePosition === "undefined" ? result.pos : topInvalidNodePosition;
|
|
33727
33737
|
const invalidElement = tryParse(() => parseJsxElementOrSelfClosingElementOrFragment(
|
|
33728
33738
|
/*inExpressionContext*/
|
|
@@ -38412,7 +38422,8 @@ var commandOptionsWithoutBuild = [
|
|
|
38412
38422
|
affectsSemanticDiagnostics: true,
|
|
38413
38423
|
category: Diagnostics.Modules,
|
|
38414
38424
|
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
|
|
38416
38427
|
},
|
|
38417
38428
|
{
|
|
38418
38429
|
name: "resolvePackageJsonExports",
|
|
@@ -45862,7 +45873,7 @@ function createBinder() {
|
|
|
45862
45873
|
}
|
|
45863
45874
|
if (!isBindingPattern(node.name)) {
|
|
45864
45875
|
const possibleVariableDecl = node.kind === 257 /* VariableDeclaration */ ? node : node.parent.parent;
|
|
45865
|
-
if (isInJSFile(node) &&
|
|
45876
|
+
if (isInJSFile(node) && shouldResolveJsRequire(options) && isVariableDeclarationInitializedToBareOrAccessedRequire(possibleVariableDecl) && !getJSDocTypeTag(node) && !(getCombinedModifierFlags(node) & 1 /* Export */)) {
|
|
45866
45877
|
declareSymbolAndAddToSymbolTable(node, 2097152 /* Alias */, 2097152 /* AliasExcludes */);
|
|
45867
45878
|
} else if (isBlockOrCatchScoped(node)) {
|
|
45868
45879
|
bindBlockScopedDeclaration(node, 2 /* BlockScopedVariable */, 111551 /* BlockScopedVariableExcludes */);
|
|
@@ -49448,7 +49459,7 @@ function createTypeChecker(host) {
|
|
|
49448
49459
|
const hasDefaultOnly = isOnlyImportedAsDefault(specifier);
|
|
49449
49460
|
const hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, specifier);
|
|
49450
49461
|
if (!exportDefaultSymbol && !hasSyntheticDefault && !hasDefaultOnly) {
|
|
49451
|
-
if (hasExportAssignmentSymbol(moduleSymbol) && !
|
|
49462
|
+
if (hasExportAssignmentSymbol(moduleSymbol) && !allowSyntheticDefaultImports) {
|
|
49452
49463
|
const compilerOptionName = moduleKind >= 5 /* ES2015 */ ? "allowSyntheticDefaultImports" : "esModuleInterop";
|
|
49453
49464
|
const exportEqualsSymbol = moduleSymbol.exports.get("export=" /* ExportEquals */);
|
|
49454
49465
|
const exportAssignment = exportEqualsSymbol.valueDeclaration;
|
|
@@ -49616,7 +49627,7 @@ function createTypeChecker(host) {
|
|
|
49616
49627
|
if (!isIdentifier(name)) {
|
|
49617
49628
|
return void 0;
|
|
49618
49629
|
}
|
|
49619
|
-
const suppressInteropError = name.escapedText === "default" /* Default */ &&
|
|
49630
|
+
const suppressInteropError = name.escapedText === "default" /* Default */ && allowSyntheticDefaultImports;
|
|
49620
49631
|
const targetSymbol = resolveESModuleSymbol(
|
|
49621
49632
|
moduleSymbol,
|
|
49622
49633
|
moduleSpecifier,
|
|
@@ -54245,7 +54256,7 @@ function createTypeChecker(host) {
|
|
|
54245
54256
|
return;
|
|
54246
54257
|
}
|
|
54247
54258
|
let verbatimTargetName = isShorthandAmbientModuleSymbol(target) && getSomeTargetNameFromDeclarations(symbol.declarations) || unescapeLeadingUnderscores(target.escapedName);
|
|
54248
|
-
if (verbatimTargetName === "export=" /* ExportEquals */ &&
|
|
54259
|
+
if (verbatimTargetName === "export=" /* ExportEquals */ && allowSyntheticDefaultImports) {
|
|
54249
54260
|
verbatimTargetName = "default" /* Default */;
|
|
54250
54261
|
}
|
|
54251
54262
|
const targetName = getInternalSymbolName(target, verbatimTargetName);
|
|
@@ -75336,7 +75347,7 @@ function createTypeChecker(host) {
|
|
|
75336
75347
|
return anyType;
|
|
75337
75348
|
}
|
|
75338
75349
|
}
|
|
75339
|
-
if (isInJSFile(node) &&
|
|
75350
|
+
if (isInJSFile(node) && shouldResolveJsRequire(compilerOptions) && isCommonJsRequire(node)) {
|
|
75340
75351
|
return resolveExternalModuleTypeByLiteral(node.arguments[0]);
|
|
75341
75352
|
}
|
|
75342
75353
|
const returnType = getReturnTypeOfSignature(signature);
|
|
@@ -94010,11 +94021,12 @@ function transformClassFields(context) {
|
|
|
94010
94021
|
return visitEachChild(node, visitor, context);
|
|
94011
94022
|
}
|
|
94012
94023
|
function visitArrayAssignmentElement(node) {
|
|
94013
|
-
|
|
94014
|
-
|
|
94015
|
-
|
|
94016
|
-
|
|
94017
|
-
|
|
94024
|
+
if (isArrayBindingOrAssignmentElement(node)) {
|
|
94025
|
+
if (isSpreadElement(node))
|
|
94026
|
+
return visitAssignmentRestElement(node);
|
|
94027
|
+
if (!isOmittedExpression(node))
|
|
94028
|
+
return visitAssignmentElement(node);
|
|
94029
|
+
}
|
|
94018
94030
|
return visitEachChild(node, visitor, context);
|
|
94019
94031
|
}
|
|
94020
94032
|
function visitAssignmentProperty(node) {
|
|
@@ -119192,7 +119204,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
|
|
|
119192
119204
|
false
|
|
119193
119205
|
);
|
|
119194
119206
|
}
|
|
119195
|
-
const shouldProcessRequires = isJavaScriptFile &&
|
|
119207
|
+
const shouldProcessRequires = isJavaScriptFile && shouldResolveJsRequire(options);
|
|
119196
119208
|
if (file.flags & 2097152 /* PossiblyContainsDynamicImport */ || shouldProcessRequires) {
|
|
119197
119209
|
collectDynamicImportOrRequireCalls(file);
|
|
119198
119210
|
}
|
|
@@ -120120,9 +120132,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
|
|
|
120120
120132
|
if (moduleKind === 2 /* AMD */ || moduleKind === 3 /* UMD */ || moduleKind === 4 /* System */) {
|
|
120121
120133
|
createDiagnosticForOptionName(Diagnostics.Option_verbatimModuleSyntax_cannot_be_used_when_module_is_set_to_UMD_AMD_or_System, "verbatimModuleSyntax");
|
|
120122
120134
|
}
|
|
120123
|
-
if (options.isolatedModules) {
|
|
120124
|
-
createRedundantOptionDiagnostic("isolatedModules", "verbatimModuleSyntax");
|
|
120125
|
-
}
|
|
120126
120135
|
if (options.preserveValueImports) {
|
|
120127
120136
|
createRedundantOptionDiagnostic("preserveValueImports", "verbatimModuleSyntax");
|
|
120128
120137
|
}
|
|
@@ -169780,6 +169789,7 @@ __export(ts_exports3, {
|
|
|
169780
169789
|
setValueDeclaration: () => setValueDeclaration,
|
|
169781
169790
|
shouldAllowImportingTsExtension: () => shouldAllowImportingTsExtension,
|
|
169782
169791
|
shouldPreserveConstEnums: () => shouldPreserveConstEnums,
|
|
169792
|
+
shouldResolveJsRequire: () => shouldResolveJsRequire,
|
|
169783
169793
|
shouldUseUriStyleNodeCoreModules: () => shouldUseUriStyleNodeCoreModules,
|
|
169784
169794
|
showModuleSpecifier: () => showModuleSpecifier,
|
|
169785
169795
|
signatureHasLiteralTypes: () => signatureHasLiteralTypes,
|
|
@@ -183727,6 +183737,7 @@ start(initializeNodeSystem(), require("os").platform());
|
|
|
183727
183737
|
setValueDeclaration,
|
|
183728
183738
|
shouldAllowImportingTsExtension,
|
|
183729
183739
|
shouldPreserveConstEnums,
|
|
183740
|
+
shouldResolveJsRequire,
|
|
183730
183741
|
shouldUseUriStyleNodeCoreModules,
|
|
183731
183742
|
showModuleSpecifier,
|
|
183732
183743
|
signatureHasLiteralTypes,
|
package/lib/tsserverlibrary.js
CHANGED
|
@@ -35,7 +35,7 @@ var ts = (() => {
|
|
|
35
35
|
"src/compiler/corePublic.ts"() {
|
|
36
36
|
"use strict";
|
|
37
37
|
versionMajorMinor = "5.0";
|
|
38
|
-
version = "5.0.
|
|
38
|
+
version = "5.0.4";
|
|
39
39
|
Comparison = /* @__PURE__ */ ((Comparison3) => {
|
|
40
40
|
Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
|
|
41
41
|
Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
|
|
@@ -17991,6 +17991,9 @@ ${lanes.join("\n")}
|
|
|
17991
17991
|
function moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution) {
|
|
17992
17992
|
return moduleResolution >= 3 /* Node16 */ && moduleResolution <= 99 /* NodeNext */ || moduleResolution === 100 /* Bundler */;
|
|
17993
17993
|
}
|
|
17994
|
+
function shouldResolveJsRequire(compilerOptions) {
|
|
17995
|
+
return !!compilerOptions.noDtsResolution || getEmitModuleResolutionKind(compilerOptions) !== 100 /* Bundler */;
|
|
17996
|
+
}
|
|
17994
17997
|
function getResolvePackageJsonExports(compilerOptions) {
|
|
17995
17998
|
const moduleResolution = getEmitModuleResolutionKind(compilerOptions);
|
|
17996
17999
|
if (!moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution)) {
|
|
@@ -31692,6 +31695,12 @@ ${lanes.join("\n")}
|
|
|
31692
31695
|
if (languageVariant === 1 /* JSX */) {
|
|
31693
31696
|
return parseJsxElementOrSelfClosingElementOrFragment(
|
|
31694
31697
|
/*inExpressionContext*/
|
|
31698
|
+
true,
|
|
31699
|
+
/*topInvalidNodePosition*/
|
|
31700
|
+
void 0,
|
|
31701
|
+
/*openingTag*/
|
|
31702
|
+
void 0,
|
|
31703
|
+
/*mustBeUnary*/
|
|
31695
31704
|
true
|
|
31696
31705
|
);
|
|
31697
31706
|
}
|
|
@@ -31796,7 +31805,7 @@ ${lanes.join("\n")}
|
|
|
31796
31805
|
true
|
|
31797
31806
|
)), pos);
|
|
31798
31807
|
}
|
|
31799
|
-
function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext, topInvalidNodePosition, openingTag) {
|
|
31808
|
+
function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext, topInvalidNodePosition, openingTag, mustBeUnary = false) {
|
|
31800
31809
|
const pos = getNodePos();
|
|
31801
31810
|
const opening = parseJsxOpeningOrSelfClosingElementOrOpeningFragment(inExpressionContext);
|
|
31802
31811
|
let result;
|
|
@@ -31834,7 +31843,7 @@ ${lanes.join("\n")}
|
|
|
31834
31843
|
Debug.assert(opening.kind === 282 /* JsxSelfClosingElement */);
|
|
31835
31844
|
result = opening;
|
|
31836
31845
|
}
|
|
31837
|
-
if (inExpressionContext && token() === 29 /* LessThanToken */) {
|
|
31846
|
+
if (!mustBeUnary && inExpressionContext && token() === 29 /* LessThanToken */) {
|
|
31838
31847
|
const topBadPos = typeof topInvalidNodePosition === "undefined" ? result.pos : topInvalidNodePosition;
|
|
31839
31848
|
const invalidElement = tryParse(() => parseJsxElementOrSelfClosingElementOrFragment(
|
|
31840
31849
|
/*inExpressionContext*/
|
|
@@ -38066,7 +38075,8 @@ ${lanes.join("\n")}
|
|
|
38066
38075
|
affectsSemanticDiagnostics: true,
|
|
38067
38076
|
category: Diagnostics.Modules,
|
|
38068
38077
|
description: Diagnostics.Allow_imports_to_include_TypeScript_file_extensions_Requires_moduleResolution_bundler_and_either_noEmit_or_emitDeclarationOnly_to_be_set,
|
|
38069
|
-
defaultValueDescription: false
|
|
38078
|
+
defaultValueDescription: false,
|
|
38079
|
+
transpileOptionValue: void 0
|
|
38070
38080
|
},
|
|
38071
38081
|
{
|
|
38072
38082
|
name: "resolvePackageJsonExports",
|
|
@@ -43764,7 +43774,7 @@ ${lanes.join("\n")}
|
|
|
43764
43774
|
}
|
|
43765
43775
|
if (!isBindingPattern(node.name)) {
|
|
43766
43776
|
const possibleVariableDecl = node.kind === 257 /* VariableDeclaration */ ? node : node.parent.parent;
|
|
43767
|
-
if (isInJSFile(node) &&
|
|
43777
|
+
if (isInJSFile(node) && shouldResolveJsRequire(options) && isVariableDeclarationInitializedToBareOrAccessedRequire(possibleVariableDecl) && !getJSDocTypeTag(node) && !(getCombinedModifierFlags(node) & 1 /* Export */)) {
|
|
43768
43778
|
declareSymbolAndAddToSymbolTable(node, 2097152 /* Alias */, 2097152 /* AliasExcludes */);
|
|
43769
43779
|
} else if (isBlockOrCatchScoped(node)) {
|
|
43770
43780
|
bindBlockScopedDeclaration(node, 2 /* BlockScopedVariable */, 111551 /* BlockScopedVariableExcludes */);
|
|
@@ -47258,7 +47268,7 @@ ${lanes.join("\n")}
|
|
|
47258
47268
|
const hasDefaultOnly = isOnlyImportedAsDefault(specifier);
|
|
47259
47269
|
const hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, specifier);
|
|
47260
47270
|
if (!exportDefaultSymbol && !hasSyntheticDefault && !hasDefaultOnly) {
|
|
47261
|
-
if (hasExportAssignmentSymbol(moduleSymbol) && !
|
|
47271
|
+
if (hasExportAssignmentSymbol(moduleSymbol) && !allowSyntheticDefaultImports) {
|
|
47262
47272
|
const compilerOptionName = moduleKind >= 5 /* ES2015 */ ? "allowSyntheticDefaultImports" : "esModuleInterop";
|
|
47263
47273
|
const exportEqualsSymbol = moduleSymbol.exports.get("export=" /* ExportEquals */);
|
|
47264
47274
|
const exportAssignment = exportEqualsSymbol.valueDeclaration;
|
|
@@ -47426,7 +47436,7 @@ ${lanes.join("\n")}
|
|
|
47426
47436
|
if (!isIdentifier(name)) {
|
|
47427
47437
|
return void 0;
|
|
47428
47438
|
}
|
|
47429
|
-
const suppressInteropError = name.escapedText === "default" /* Default */ &&
|
|
47439
|
+
const suppressInteropError = name.escapedText === "default" /* Default */ && allowSyntheticDefaultImports;
|
|
47430
47440
|
const targetSymbol = resolveESModuleSymbol(
|
|
47431
47441
|
moduleSymbol,
|
|
47432
47442
|
moduleSpecifier,
|
|
@@ -52055,7 +52065,7 @@ ${lanes.join("\n")}
|
|
|
52055
52065
|
return;
|
|
52056
52066
|
}
|
|
52057
52067
|
let verbatimTargetName = isShorthandAmbientModuleSymbol(target) && getSomeTargetNameFromDeclarations(symbol.declarations) || unescapeLeadingUnderscores(target.escapedName);
|
|
52058
|
-
if (verbatimTargetName === "export=" /* ExportEquals */ &&
|
|
52068
|
+
if (verbatimTargetName === "export=" /* ExportEquals */ && allowSyntheticDefaultImports) {
|
|
52059
52069
|
verbatimTargetName = "default" /* Default */;
|
|
52060
52070
|
}
|
|
52061
52071
|
const targetName = getInternalSymbolName(target, verbatimTargetName);
|
|
@@ -73146,7 +73156,7 @@ ${lanes.join("\n")}
|
|
|
73146
73156
|
return anyType;
|
|
73147
73157
|
}
|
|
73148
73158
|
}
|
|
73149
|
-
if (isInJSFile(node) &&
|
|
73159
|
+
if (isInJSFile(node) && shouldResolveJsRequire(compilerOptions) && isCommonJsRequire(node)) {
|
|
73150
73160
|
return resolveExternalModuleTypeByLiteral(node.arguments[0]);
|
|
73151
73161
|
}
|
|
73152
73162
|
const returnType = getReturnTypeOfSignature(signature);
|
|
@@ -91995,11 +92005,12 @@ ${lanes.join("\n")}
|
|
|
91995
92005
|
return visitEachChild(node, visitor, context);
|
|
91996
92006
|
}
|
|
91997
92007
|
function visitArrayAssignmentElement(node) {
|
|
91998
|
-
|
|
91999
|
-
|
|
92000
|
-
|
|
92001
|
-
|
|
92002
|
-
|
|
92008
|
+
if (isArrayBindingOrAssignmentElement(node)) {
|
|
92009
|
+
if (isSpreadElement(node))
|
|
92010
|
+
return visitAssignmentRestElement(node);
|
|
92011
|
+
if (!isOmittedExpression(node))
|
|
92012
|
+
return visitAssignmentElement(node);
|
|
92013
|
+
}
|
|
92003
92014
|
return visitEachChild(node, visitor, context);
|
|
92004
92015
|
}
|
|
92005
92016
|
function visitAssignmentProperty(node) {
|
|
@@ -117210,7 +117221,7 @@ ${lanes.join("\n")}
|
|
|
117210
117221
|
false
|
|
117211
117222
|
);
|
|
117212
117223
|
}
|
|
117213
|
-
const shouldProcessRequires = isJavaScriptFile &&
|
|
117224
|
+
const shouldProcessRequires = isJavaScriptFile && shouldResolveJsRequire(options);
|
|
117214
117225
|
if (file.flags & 2097152 /* PossiblyContainsDynamicImport */ || shouldProcessRequires) {
|
|
117215
117226
|
collectDynamicImportOrRequireCalls(file);
|
|
117216
117227
|
}
|
|
@@ -118138,9 +118149,6 @@ ${lanes.join("\n")}
|
|
|
118138
118149
|
if (moduleKind === 2 /* AMD */ || moduleKind === 3 /* UMD */ || moduleKind === 4 /* System */) {
|
|
118139
118150
|
createDiagnosticForOptionName(Diagnostics.Option_verbatimModuleSyntax_cannot_be_used_when_module_is_set_to_UMD_AMD_or_System, "verbatimModuleSyntax");
|
|
118140
118151
|
}
|
|
118141
|
-
if (options.isolatedModules) {
|
|
118142
|
-
createRedundantOptionDiagnostic("isolatedModules", "verbatimModuleSyntax");
|
|
118143
|
-
}
|
|
118144
118152
|
if (options.preserveValueImports) {
|
|
118145
118153
|
createRedundantOptionDiagnostic("preserveValueImports", "verbatimModuleSyntax");
|
|
118146
118154
|
}
|
|
@@ -180367,6 +180375,7 @@ ${e.message}`;
|
|
|
180367
180375
|
setValueDeclaration: () => setValueDeclaration,
|
|
180368
180376
|
shouldAllowImportingTsExtension: () => shouldAllowImportingTsExtension,
|
|
180369
180377
|
shouldPreserveConstEnums: () => shouldPreserveConstEnums,
|
|
180378
|
+
shouldResolveJsRequire: () => shouldResolveJsRequire,
|
|
180370
180379
|
shouldUseUriStyleNodeCoreModules: () => shouldUseUriStyleNodeCoreModules,
|
|
180371
180380
|
showModuleSpecifier: () => showModuleSpecifier,
|
|
180372
180381
|
signatureHasLiteralTypes: () => signatureHasLiteralTypes,
|
|
@@ -182725,6 +182734,7 @@ ${e.message}`;
|
|
|
182725
182734
|
setValueDeclaration: () => setValueDeclaration,
|
|
182726
182735
|
shouldAllowImportingTsExtension: () => shouldAllowImportingTsExtension,
|
|
182727
182736
|
shouldPreserveConstEnums: () => shouldPreserveConstEnums,
|
|
182737
|
+
shouldResolveJsRequire: () => shouldResolveJsRequire,
|
|
182728
182738
|
shouldUseUriStyleNodeCoreModules: () => shouldUseUriStyleNodeCoreModules,
|
|
182729
182739
|
showModuleSpecifier: () => showModuleSpecifier,
|
|
182730
182740
|
signatureHasLiteralTypes: () => signatureHasLiteralTypes,
|
package/lib/typescript.js
CHANGED
|
@@ -35,7 +35,7 @@ var ts = (() => {
|
|
|
35
35
|
"src/compiler/corePublic.ts"() {
|
|
36
36
|
"use strict";
|
|
37
37
|
versionMajorMinor = "5.0";
|
|
38
|
-
version = "5.0.
|
|
38
|
+
version = "5.0.4";
|
|
39
39
|
Comparison = /* @__PURE__ */ ((Comparison3) => {
|
|
40
40
|
Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
|
|
41
41
|
Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
|
|
@@ -17991,6 +17991,9 @@ ${lanes.join("\n")}
|
|
|
17991
17991
|
function moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution) {
|
|
17992
17992
|
return moduleResolution >= 3 /* Node16 */ && moduleResolution <= 99 /* NodeNext */ || moduleResolution === 100 /* Bundler */;
|
|
17993
17993
|
}
|
|
17994
|
+
function shouldResolveJsRequire(compilerOptions) {
|
|
17995
|
+
return !!compilerOptions.noDtsResolution || getEmitModuleResolutionKind(compilerOptions) !== 100 /* Bundler */;
|
|
17996
|
+
}
|
|
17994
17997
|
function getResolvePackageJsonExports(compilerOptions) {
|
|
17995
17998
|
const moduleResolution = getEmitModuleResolutionKind(compilerOptions);
|
|
17996
17999
|
if (!moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution)) {
|
|
@@ -31692,6 +31695,12 @@ ${lanes.join("\n")}
|
|
|
31692
31695
|
if (languageVariant === 1 /* JSX */) {
|
|
31693
31696
|
return parseJsxElementOrSelfClosingElementOrFragment(
|
|
31694
31697
|
/*inExpressionContext*/
|
|
31698
|
+
true,
|
|
31699
|
+
/*topInvalidNodePosition*/
|
|
31700
|
+
void 0,
|
|
31701
|
+
/*openingTag*/
|
|
31702
|
+
void 0,
|
|
31703
|
+
/*mustBeUnary*/
|
|
31695
31704
|
true
|
|
31696
31705
|
);
|
|
31697
31706
|
}
|
|
@@ -31796,7 +31805,7 @@ ${lanes.join("\n")}
|
|
|
31796
31805
|
true
|
|
31797
31806
|
)), pos);
|
|
31798
31807
|
}
|
|
31799
|
-
function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext, topInvalidNodePosition, openingTag) {
|
|
31808
|
+
function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext, topInvalidNodePosition, openingTag, mustBeUnary = false) {
|
|
31800
31809
|
const pos = getNodePos();
|
|
31801
31810
|
const opening = parseJsxOpeningOrSelfClosingElementOrOpeningFragment(inExpressionContext);
|
|
31802
31811
|
let result;
|
|
@@ -31834,7 +31843,7 @@ ${lanes.join("\n")}
|
|
|
31834
31843
|
Debug.assert(opening.kind === 282 /* JsxSelfClosingElement */);
|
|
31835
31844
|
result = opening;
|
|
31836
31845
|
}
|
|
31837
|
-
if (inExpressionContext && token() === 29 /* LessThanToken */) {
|
|
31846
|
+
if (!mustBeUnary && inExpressionContext && token() === 29 /* LessThanToken */) {
|
|
31838
31847
|
const topBadPos = typeof topInvalidNodePosition === "undefined" ? result.pos : topInvalidNodePosition;
|
|
31839
31848
|
const invalidElement = tryParse(() => parseJsxElementOrSelfClosingElementOrFragment(
|
|
31840
31849
|
/*inExpressionContext*/
|
|
@@ -38066,7 +38075,8 @@ ${lanes.join("\n")}
|
|
|
38066
38075
|
affectsSemanticDiagnostics: true,
|
|
38067
38076
|
category: Diagnostics.Modules,
|
|
38068
38077
|
description: Diagnostics.Allow_imports_to_include_TypeScript_file_extensions_Requires_moduleResolution_bundler_and_either_noEmit_or_emitDeclarationOnly_to_be_set,
|
|
38069
|
-
defaultValueDescription: false
|
|
38078
|
+
defaultValueDescription: false,
|
|
38079
|
+
transpileOptionValue: void 0
|
|
38070
38080
|
},
|
|
38071
38081
|
{
|
|
38072
38082
|
name: "resolvePackageJsonExports",
|
|
@@ -43764,7 +43774,7 @@ ${lanes.join("\n")}
|
|
|
43764
43774
|
}
|
|
43765
43775
|
if (!isBindingPattern(node.name)) {
|
|
43766
43776
|
const possibleVariableDecl = node.kind === 257 /* VariableDeclaration */ ? node : node.parent.parent;
|
|
43767
|
-
if (isInJSFile(node) &&
|
|
43777
|
+
if (isInJSFile(node) && shouldResolveJsRequire(options) && isVariableDeclarationInitializedToBareOrAccessedRequire(possibleVariableDecl) && !getJSDocTypeTag(node) && !(getCombinedModifierFlags(node) & 1 /* Export */)) {
|
|
43768
43778
|
declareSymbolAndAddToSymbolTable(node, 2097152 /* Alias */, 2097152 /* AliasExcludes */);
|
|
43769
43779
|
} else if (isBlockOrCatchScoped(node)) {
|
|
43770
43780
|
bindBlockScopedDeclaration(node, 2 /* BlockScopedVariable */, 111551 /* BlockScopedVariableExcludes */);
|
|
@@ -47258,7 +47268,7 @@ ${lanes.join("\n")}
|
|
|
47258
47268
|
const hasDefaultOnly = isOnlyImportedAsDefault(specifier);
|
|
47259
47269
|
const hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias, specifier);
|
|
47260
47270
|
if (!exportDefaultSymbol && !hasSyntheticDefault && !hasDefaultOnly) {
|
|
47261
|
-
if (hasExportAssignmentSymbol(moduleSymbol) && !
|
|
47271
|
+
if (hasExportAssignmentSymbol(moduleSymbol) && !allowSyntheticDefaultImports) {
|
|
47262
47272
|
const compilerOptionName = moduleKind >= 5 /* ES2015 */ ? "allowSyntheticDefaultImports" : "esModuleInterop";
|
|
47263
47273
|
const exportEqualsSymbol = moduleSymbol.exports.get("export=" /* ExportEquals */);
|
|
47264
47274
|
const exportAssignment = exportEqualsSymbol.valueDeclaration;
|
|
@@ -47426,7 +47436,7 @@ ${lanes.join("\n")}
|
|
|
47426
47436
|
if (!isIdentifier(name)) {
|
|
47427
47437
|
return void 0;
|
|
47428
47438
|
}
|
|
47429
|
-
const suppressInteropError = name.escapedText === "default" /* Default */ &&
|
|
47439
|
+
const suppressInteropError = name.escapedText === "default" /* Default */ && allowSyntheticDefaultImports;
|
|
47430
47440
|
const targetSymbol = resolveESModuleSymbol(
|
|
47431
47441
|
moduleSymbol,
|
|
47432
47442
|
moduleSpecifier,
|
|
@@ -52055,7 +52065,7 @@ ${lanes.join("\n")}
|
|
|
52055
52065
|
return;
|
|
52056
52066
|
}
|
|
52057
52067
|
let verbatimTargetName = isShorthandAmbientModuleSymbol(target) && getSomeTargetNameFromDeclarations(symbol.declarations) || unescapeLeadingUnderscores(target.escapedName);
|
|
52058
|
-
if (verbatimTargetName === "export=" /* ExportEquals */ &&
|
|
52068
|
+
if (verbatimTargetName === "export=" /* ExportEquals */ && allowSyntheticDefaultImports) {
|
|
52059
52069
|
verbatimTargetName = "default" /* Default */;
|
|
52060
52070
|
}
|
|
52061
52071
|
const targetName = getInternalSymbolName(target, verbatimTargetName);
|
|
@@ -73146,7 +73156,7 @@ ${lanes.join("\n")}
|
|
|
73146
73156
|
return anyType;
|
|
73147
73157
|
}
|
|
73148
73158
|
}
|
|
73149
|
-
if (isInJSFile(node) &&
|
|
73159
|
+
if (isInJSFile(node) && shouldResolveJsRequire(compilerOptions) && isCommonJsRequire(node)) {
|
|
73150
73160
|
return resolveExternalModuleTypeByLiteral(node.arguments[0]);
|
|
73151
73161
|
}
|
|
73152
73162
|
const returnType = getReturnTypeOfSignature(signature);
|
|
@@ -91995,11 +92005,12 @@ ${lanes.join("\n")}
|
|
|
91995
92005
|
return visitEachChild(node, visitor, context);
|
|
91996
92006
|
}
|
|
91997
92007
|
function visitArrayAssignmentElement(node) {
|
|
91998
|
-
|
|
91999
|
-
|
|
92000
|
-
|
|
92001
|
-
|
|
92002
|
-
|
|
92008
|
+
if (isArrayBindingOrAssignmentElement(node)) {
|
|
92009
|
+
if (isSpreadElement(node))
|
|
92010
|
+
return visitAssignmentRestElement(node);
|
|
92011
|
+
if (!isOmittedExpression(node))
|
|
92012
|
+
return visitAssignmentElement(node);
|
|
92013
|
+
}
|
|
92003
92014
|
return visitEachChild(node, visitor, context);
|
|
92004
92015
|
}
|
|
92005
92016
|
function visitAssignmentProperty(node) {
|
|
@@ -117210,7 +117221,7 @@ ${lanes.join("\n")}
|
|
|
117210
117221
|
false
|
|
117211
117222
|
);
|
|
117212
117223
|
}
|
|
117213
|
-
const shouldProcessRequires = isJavaScriptFile &&
|
|
117224
|
+
const shouldProcessRequires = isJavaScriptFile && shouldResolveJsRequire(options);
|
|
117214
117225
|
if (file.flags & 2097152 /* PossiblyContainsDynamicImport */ || shouldProcessRequires) {
|
|
117215
117226
|
collectDynamicImportOrRequireCalls(file);
|
|
117216
117227
|
}
|
|
@@ -118138,9 +118149,6 @@ ${lanes.join("\n")}
|
|
|
118138
118149
|
if (moduleKind === 2 /* AMD */ || moduleKind === 3 /* UMD */ || moduleKind === 4 /* System */) {
|
|
118139
118150
|
createDiagnosticForOptionName(Diagnostics.Option_verbatimModuleSyntax_cannot_be_used_when_module_is_set_to_UMD_AMD_or_System, "verbatimModuleSyntax");
|
|
118140
118151
|
}
|
|
118141
|
-
if (options.isolatedModules) {
|
|
118142
|
-
createRedundantOptionDiagnostic("isolatedModules", "verbatimModuleSyntax");
|
|
118143
|
-
}
|
|
118144
118152
|
if (options.preserveValueImports) {
|
|
118145
118153
|
createRedundantOptionDiagnostic("preserveValueImports", "verbatimModuleSyntax");
|
|
118146
118154
|
}
|
|
@@ -169548,6 +169556,7 @@ ${options.prefix}` : "\n" : options.prefix
|
|
|
169548
169556
|
setValueDeclaration: () => setValueDeclaration,
|
|
169549
169557
|
shouldAllowImportingTsExtension: () => shouldAllowImportingTsExtension,
|
|
169550
169558
|
shouldPreserveConstEnums: () => shouldPreserveConstEnums,
|
|
169559
|
+
shouldResolveJsRequire: () => shouldResolveJsRequire,
|
|
169551
169560
|
shouldUseUriStyleNodeCoreModules: () => shouldUseUriStyleNodeCoreModules,
|
|
169552
169561
|
showModuleSpecifier: () => showModuleSpecifier,
|
|
169553
169562
|
signatureHasLiteralTypes: () => signatureHasLiteralTypes,
|
package/lib/typingsInstaller.js
CHANGED
|
@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
|
|
|
54
54
|
|
|
55
55
|
// src/compiler/corePublic.ts
|
|
56
56
|
var versionMajorMinor = "5.0";
|
|
57
|
-
var version = "5.0.
|
|
57
|
+
var version = "5.0.4";
|
|
58
58
|
|
|
59
59
|
// src/compiler/core.ts
|
|
60
60
|
var emptyArray = [];
|
|
@@ -11947,6 +11947,9 @@ function unusedLabelIsError(options) {
|
|
|
11947
11947
|
function moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution) {
|
|
11948
11948
|
return moduleResolution >= 3 /* Node16 */ && moduleResolution <= 99 /* NodeNext */ || moduleResolution === 100 /* Bundler */;
|
|
11949
11949
|
}
|
|
11950
|
+
function shouldResolveJsRequire(compilerOptions) {
|
|
11951
|
+
return !!compilerOptions.noDtsResolution || getEmitModuleResolutionKind(compilerOptions) !== 100 /* Bundler */;
|
|
11952
|
+
}
|
|
11950
11953
|
function getResolveJsonModule(compilerOptions) {
|
|
11951
11954
|
if (compilerOptions.resolveJsonModule !== void 0) {
|
|
11952
11955
|
return compilerOptions.resolveJsonModule;
|
|
@@ -22092,6 +22095,12 @@ var Parser;
|
|
|
22092
22095
|
if (languageVariant === 1 /* JSX */) {
|
|
22093
22096
|
return parseJsxElementOrSelfClosingElementOrFragment(
|
|
22094
22097
|
/*inExpressionContext*/
|
|
22098
|
+
true,
|
|
22099
|
+
/*topInvalidNodePosition*/
|
|
22100
|
+
void 0,
|
|
22101
|
+
/*openingTag*/
|
|
22102
|
+
void 0,
|
|
22103
|
+
/*mustBeUnary*/
|
|
22095
22104
|
true
|
|
22096
22105
|
);
|
|
22097
22106
|
}
|
|
@@ -22196,7 +22205,7 @@ var Parser;
|
|
|
22196
22205
|
true
|
|
22197
22206
|
)), pos);
|
|
22198
22207
|
}
|
|
22199
|
-
function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext, topInvalidNodePosition, openingTag) {
|
|
22208
|
+
function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext, topInvalidNodePosition, openingTag, mustBeUnary = false) {
|
|
22200
22209
|
const pos = getNodePos();
|
|
22201
22210
|
const opening = parseJsxOpeningOrSelfClosingElementOrOpeningFragment(inExpressionContext);
|
|
22202
22211
|
let result;
|
|
@@ -22234,7 +22243,7 @@ var Parser;
|
|
|
22234
22243
|
Debug.assert(opening.kind === 282 /* JsxSelfClosingElement */);
|
|
22235
22244
|
result = opening;
|
|
22236
22245
|
}
|
|
22237
|
-
if (inExpressionContext && token() === 29 /* LessThanToken */) {
|
|
22246
|
+
if (!mustBeUnary && inExpressionContext && token() === 29 /* LessThanToken */) {
|
|
22238
22247
|
const topBadPos = typeof topInvalidNodePosition === "undefined" ? result.pos : topInvalidNodePosition;
|
|
22239
22248
|
const invalidElement = tryParse(() => parseJsxElementOrSelfClosingElementOrFragment(
|
|
22240
22249
|
/*inExpressionContext*/
|
|
@@ -26924,7 +26933,8 @@ var commandOptionsWithoutBuild = [
|
|
|
26924
26933
|
affectsSemanticDiagnostics: true,
|
|
26925
26934
|
category: Diagnostics.Modules,
|
|
26926
26935
|
description: Diagnostics.Allow_imports_to_include_TypeScript_file_extensions_Requires_moduleResolution_bundler_and_either_noEmit_or_emitDeclarationOnly_to_be_set,
|
|
26927
|
-
defaultValueDescription: false
|
|
26936
|
+
defaultValueDescription: false,
|
|
26937
|
+
transpileOptionValue: void 0
|
|
26928
26938
|
},
|
|
26929
26939
|
{
|
|
26930
26940
|
name: "resolvePackageJsonExports",
|
|
@@ -32226,7 +32236,7 @@ function createBinder() {
|
|
|
32226
32236
|
}
|
|
32227
32237
|
if (!isBindingPattern(node.name)) {
|
|
32228
32238
|
const possibleVariableDecl = node.kind === 257 /* VariableDeclaration */ ? node : node.parent.parent;
|
|
32229
|
-
if (isInJSFile(node) &&
|
|
32239
|
+
if (isInJSFile(node) && shouldResolveJsRequire(options) && isVariableDeclarationInitializedToBareOrAccessedRequire(possibleVariableDecl) && !getJSDocTypeTag(node) && !(getCombinedModifierFlags(node) & 1 /* Export */)) {
|
|
32230
32240
|
declareSymbolAndAddToSymbolTable(node, 2097152 /* Alias */, 2097152 /* AliasExcludes */);
|
|
32231
32241
|
} else if (isBlockOrCatchScoped(node)) {
|
|
32232
32242
|
bindBlockScopedDeclaration(node, 2 /* BlockScopedVariable */, 111551 /* BlockScopedVariableExcludes */);
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "typescript",
|
|
3
3
|
"author": "Microsoft Corp.",
|
|
4
4
|
"homepage": "https://www.typescriptlang.org/",
|
|
5
|
-
"version": "5.0.
|
|
5
|
+
"version": "5.0.4",
|
|
6
6
|
"license": "Apache-2.0",
|
|
7
7
|
"description": "TypeScript is a language for application scale JavaScript development",
|
|
8
8
|
"keywords": [
|