Skip to content

Commit f3e94f0

Browse files
rbucktonrbuckton
committed
Merge branch 'main' into instanceof-Symbol.hasInstance
2 parents 8af777e + 55d8bed commit f3e94f0

File tree

314 files changed

+14176
-3781
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

314 files changed

+14176
-3781
lines changed

‎package-lock.json

+136-136
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scripts/hooks/post-checkout

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/sh
2-
npm run npx hereby -- generate-diagnostics
2+
./node_modules/.bin/hereby generate-diagnostics || true

‎scripts/hooks/pre-commit

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
if git diff --name-only --cached --relative | xargs --no-run-if-empty ./node_modules/.bin/dprint fmt; then
3+
git diff --name-only --cached --relative | xargs --no-run-if-empty git add
4+
fi

‎scripts/link-hooks.mjs

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ const __dirname = path.dirname(__filename);
1111

1212
const hooks = [
1313
"post-checkout",
14+
"pre-commit",
1415
];
1516

1617
hooks.forEach(hook => {

‎src/compiler/binder.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ import {
136136
isBlock,
137137
isBlockOrCatchScoped,
138138
IsBlockScopedContainer,
139+
isBooleanLiteral,
139140
isCallExpression,
140141
isClassStaticBlockDeclaration,
141142
isConditionalTypeNode,
@@ -1279,7 +1280,8 @@ function createBinder(): (file: SourceFile, options: CompilerOptions) => void {
12791280
case SyntaxKind.EqualsEqualsEqualsToken:
12801281
case SyntaxKind.ExclamationEqualsEqualsToken:
12811282
return isNarrowableOperand(expr.left) || isNarrowableOperand(expr.right) ||
1282-
isNarrowingTypeofOperands(expr.right, expr.left) || isNarrowingTypeofOperands(expr.left, expr.right);
1283+
isNarrowingTypeofOperands(expr.right, expr.left) || isNarrowingTypeofOperands(expr.left, expr.right) ||
1284+
(isBooleanLiteral(expr.right) && isNarrowingExpression(expr.left) || isBooleanLiteral(expr.left) && isNarrowingExpression(expr.right));
12831285
case SyntaxKind.InstanceOfKeyword:
12841286
return isNarrowableOperand(expr.left);
12851287
case SyntaxKind.InKeyword:

‎src/compiler/builderState.ts

+8-10
Original file line numberDiff line numberDiff line change
@@ -238,17 +238,15 @@ export namespace BuilderState {
238238
}
239239

240240
// Handle type reference directives
241-
if (sourceFile.resolvedTypeReferenceDirectiveNames) {
242-
sourceFile.resolvedTypeReferenceDirectiveNames.forEach(({ resolvedTypeReferenceDirective }) => {
243-
if (!resolvedTypeReferenceDirective) {
244-
return;
245-
}
241+
program.forEachResolvedTypeReferenceDirective(({ resolvedTypeReferenceDirective }) => {
242+
if (!resolvedTypeReferenceDirective) {
243+
return;
244+
}
246245

247-
const fileName = resolvedTypeReferenceDirective.resolvedFileName!; // TODO: GH#18217
248-
const typeFilePath = getReferencedFileFromFileName(program, fileName, sourceFileDirectory, getCanonicalFileName);
249-
addReferencedFile(typeFilePath);
250-
});
251-
}
246+
const fileName = resolvedTypeReferenceDirective.resolvedFileName!; // TODO: GH#18217
247+
const typeFilePath = getReferencedFileFromFileName(program, fileName, sourceFileDirectory, getCanonicalFileName);
248+
addReferencedFile(typeFilePath);
249+
}, sourceFile);
252250

253251
// Add module augmentation as references
254252
if (sourceFile.moduleAugmentations.length) {

‎src/compiler/checker.ts

+48-6
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import {
3434
BigIntLiteral,
3535
BigIntLiteralType,
3636
BinaryExpression,
37+
BinaryOperator,
3738
BinaryOperatorToken,
3839
binarySearch,
3940
BindableObjectDefinePropertyCall,
@@ -44,6 +45,7 @@ import {
4445
BindingPattern,
4546
bindSourceFile,
4647
Block,
48+
BooleanLiteral,
4749
BreakOrContinueStatement,
4850
CallChain,
4951
CallExpression,
@@ -340,7 +342,6 @@ import {
340342
getResolutionDiagnostic,
341343
getResolutionModeOverrideForClause,
342344
getResolvedExternalModuleName,
343-
getResolvedModule,
344345
getResolveJsonModule,
345346
getRestParameterElementType,
346347
getRootDeclaration,
@@ -477,6 +478,7 @@ import {
477478
isClassDeclaration,
478479
isClassElement,
479480
isClassExpression,
481+
isClassFieldAndNotAutoAccessor,
480482
isClassLike,
481483
isClassStaticBlockDeclaration,
482484
isCommaSequence,
@@ -4961,7 +4963,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
49614963
(isLiteralImportTypeNode(location) ? location : undefined)?.argument.literal;
49624964
const mode = contextSpecifier && isStringLiteralLike(contextSpecifier) ? getModeForUsageLocation(currentSourceFile, contextSpecifier) : currentSourceFile.impliedNodeFormat;
49634965
const moduleResolutionKind = getEmitModuleResolutionKind(compilerOptions);
4964-
const resolvedModule = getResolvedModule(currentSourceFile, moduleReference, mode);
4966+
const resolvedModule = host.getResolvedModule(currentSourceFile, moduleReference, mode)?.resolvedModule;
49654967
const resolutionDiagnostic = resolvedModule && getResolutionDiagnostic(compilerOptions, resolvedModule, currentSourceFile);
49664968
const sourceFile = resolvedModule
49674969
&& (!resolutionDiagnostic || resolutionDiagnostic === Diagnostics.Module_0_was_resolved_to_1_but_jsx_is_not_set)
@@ -12824,7 +12826,24 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
1282412826
}
1282512827
}
1282612828

12827-
links[resolutionKind] = combineSymbolTables(earlySymbols, lateSymbols) || emptySymbols;
12829+
let resolved = combineSymbolTables(earlySymbols, lateSymbols);
12830+
if (symbol.flags & SymbolFlags.Transient && links.cjsExportMerged && symbol.declarations) {
12831+
for (const decl of symbol.declarations) {
12832+
const original = getSymbolLinks(decl.symbol)[resolutionKind];
12833+
if (!resolved) {
12834+
resolved = original;
12835+
continue;
12836+
}
12837+
if (!original) continue;
12838+
original.forEach((s, name) => {
12839+
const existing = resolved!.get(name);
12840+
if (!existing) resolved!.set(name, s);
12841+
else if (existing === s) return;
12842+
else resolved!.set(name, mergeSymbol(existing, s));
12843+
});
12844+
}
12845+
}
12846+
links[resolutionKind] = resolved || emptySymbols;
1282812847
}
1282912848

1283012849
return links[resolutionKind]!;
@@ -13913,7 +13932,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
1391313932
function isConstTypeVariable(type: Type | undefined, depth = 0): boolean {
1391413933
return depth < 5 && !!(type && (
1391513934
type.flags & TypeFlags.TypeParameter && some((type as TypeParameter).symbol?.declarations, d => hasSyntacticModifier(d, ModifierFlags.Const)) ||
13916-
type.flags & TypeFlags.Union && some((type as UnionType).types, t => isConstTypeVariable(t, depth)) ||
13935+
type.flags & TypeFlags.UnionOrIntersection && some((type as UnionOrIntersectionType).types, t => isConstTypeVariable(t, depth)) ||
1391713936
type.flags & TypeFlags.IndexedAccess && isConstTypeVariable((type as IndexedAccessType).objectType, depth + 1) ||
1391813937
type.flags & TypeFlags.Conditional && isConstTypeVariable(getConstraintOfConditionalType(type as ConditionalType), depth + 1) ||
1391913938
type.flags & TypeFlags.Substitution && isConstTypeVariable((type as SubstitutionType).baseType, depth) ||
@@ -27668,6 +27687,11 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
2766827687
return type;
2766927688
}
2767027689

27690+
function narrowTypeByBooleanComparison(type: Type, expr: Expression, bool: BooleanLiteral, operator: BinaryOperator, assumeTrue: boolean): Type {
27691+
assumeTrue = (assumeTrue !== (bool.kind === SyntaxKind.TrueKeyword)) !== (operator !== SyntaxKind.ExclamationEqualsEqualsToken && operator !== SyntaxKind.ExclamationEqualsToken);
27692+
return narrowType(type, expr, assumeTrue);
27693+
}
27694+
2767127695
function narrowTypeByBinaryExpression(type: Type, expr: BinaryExpression, assumeTrue: boolean): Type {
2767227696
switch (expr.operatorToken.kind) {
2767327697
case SyntaxKind.EqualsToken:
@@ -27716,6 +27740,12 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
2771627740
if (isMatchingConstructorReference(right)) {
2771727741
return narrowTypeByConstructor(type, operator, left, assumeTrue);
2771827742
}
27743+
if (isBooleanLiteral(right)) {
27744+
return narrowTypeByBooleanComparison(type, left, right, operator, assumeTrue);
27745+
}
27746+
if (isBooleanLiteral(left)) {
27747+
return narrowTypeByBooleanComparison(type, right, left, operator, assumeTrue);
27748+
}
2771927749
break;
2772027750
case SyntaxKind.InstanceOfKeyword:
2772127751
return narrowTypeByInstanceof(type, expr as InstanceofExpression, assumeTrue);
@@ -31811,6 +31841,14 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
3181131841
}
3181231842
return false;
3181331843
}
31844+
// A class field cannot be accessed via super.* from a derived class.
31845+
// This is true for both [[Set]] (old) and [[Define]] (ES spec) semantics.
31846+
if (!(flags & ModifierFlags.Static) && prop.declarations?.some(isClassFieldAndNotAutoAccessor)) {
31847+
if (errorNode) {
31848+
error(errorNode, Diagnostics.Class_field_0_defined_by_the_parent_class_is_not_accessible_in_the_child_class_via_super, symbolToString(prop));
31849+
}
31850+
return false;
31851+
}
3181431852
}
3181531853

3181631854
// Referencing abstract properties within their own constructors is not allowed
@@ -32297,9 +32335,13 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
3229732335
if (file) {
3229832336
if (compilerOptions.checkJs === undefined && file.checkJsDirective === undefined && (file.scriptKind === ScriptKind.JS || file.scriptKind === ScriptKind.JSX)) {
3229932337
const declarationFile = forEach(suggestion?.declarations, getSourceFileOfNode);
32338+
const suggestionHasNoExtendsOrDecorators = !suggestion?.valueDeclaration
32339+
|| !isClassLike(suggestion.valueDeclaration)
32340+
|| suggestion.valueDeclaration.heritageClauses?.length
32341+
|| classOrConstructorParameterIsDecorated(/*useLegacyDecorators*/ false, suggestion.valueDeclaration);
3230032342
return !(file !== declarationFile && !!declarationFile && isGlobalSourceFile(declarationFile))
32301-
&& !(excludeClasses && suggestion && suggestion.flags & SymbolFlags.Class)
32302-
&& !(!!node && excludeClasses && isPropertyAccessExpression(node) && node.expression.kind === SyntaxKind.ThisKeyword);
32343+
&& !(excludeClasses && suggestion && suggestion.flags & SymbolFlags.Class && suggestionHasNoExtendsOrDecorators)
32344+
&& !(!!node && excludeClasses && isPropertyAccessExpression(node) && node.expression.kind === SyntaxKind.ThisKeyword && suggestionHasNoExtendsOrDecorators);
3230332345
}
3230432346
}
3230532347
return false;

‎src/compiler/commandLineParser.ts

+12-2
Original file line numberDiff line numberDiff line change
@@ -553,6 +553,7 @@ export const moduleOptionDeclaration: CommandLineOptionOfCustomType = {
553553
node16: ModuleKind.Node16,
554554
nodenext: ModuleKind.NodeNext,
555555
})),
556+
affectsSourceFile: true,
556557
affectsModuleResolution: true,
557558
affectsEmit: true,
558559
affectsBuildInfo: true,
@@ -647,7 +648,8 @@ const commandOptionsWithoutBuild: CommandLineOption[] = [
647648
{
648649
name: "allowJs",
649650
type: "boolean",
650-
affectsModuleResolution: true,
651+
allowJsFlag: true,
652+
affectsBuildInfo: true,
651653
showInSimplifiedHelpView: true,
652654
category: Diagnostics.JavaScript_Support,
653655
description: Diagnostics.Allow_JavaScript_files_to_be_a_part_of_your_program_Use_the_checkJS_option_to_get_errors_from_these_files,
@@ -657,6 +659,8 @@ const commandOptionsWithoutBuild: CommandLineOption[] = [
657659
name: "checkJs",
658660
type: "boolean",
659661
affectsModuleResolution: true,
662+
affectsSemanticDiagnostics: true,
663+
affectsBuildInfo: true,
660664
showInSimplifiedHelpView: true,
661665
category: Diagnostics.JavaScript_Support,
662666
description: Diagnostics.Enable_error_reporting_in_type_checked_JavaScript_files,
@@ -669,6 +673,10 @@ const commandOptionsWithoutBuild: CommandLineOption[] = [
669673
affectsEmit: true,
670674
affectsBuildInfo: true,
671675
affectsModuleResolution: true,
676+
// The checker emits an error when it sees JSX but this option is not set in compilerOptions.
677+
// This is effectively a semantic error, so mark this option as affecting semantic diagnostics
678+
// so we know to refresh errors when this option is changed.
679+
affectsSemanticDiagnostics: true,
672680
paramType: Diagnostics.KIND,
673681
showInSimplifiedHelpView: true,
674682
category: Diagnostics.Language_and_Environment,
@@ -987,6 +995,7 @@ const commandOptionsWithoutBuild: CommandLineOption[] = [
987995
bundler: ModuleResolutionKind.Bundler,
988996
})),
989997
deprecatedKeys: new Set(["node"]),
998+
affectsSourceFile: true,
990999
affectsModuleResolution: true,
9911000
paramType: Diagnostics.STRATEGY,
9921001
category: Diagnostics.Modules,
@@ -1533,6 +1542,7 @@ const commandOptionsWithoutBuild: CommandLineOption[] = [
15331542
legacy: ModuleDetectionKind.Legacy,
15341543
force: ModuleDetectionKind.Force,
15351544
})),
1545+
affectsSourceFile: true,
15361546
affectsModuleResolution: true,
15371547
description: Diagnostics.Control_what_method_is_used_to_detect_module_format_JS_files,
15381548
category: Diagnostics.Language_and_Environment,
@@ -1564,7 +1574,7 @@ export const affectsDeclarationPathOptionDeclarations: readonly CommandLineOptio
15641574
export const moduleResolutionOptionDeclarations: readonly CommandLineOption[] = optionDeclarations.filter(option => !!option.affectsModuleResolution);
15651575

15661576
/** @internal */
1567-
export const sourceFileAffectingCompilerOptions: readonly CommandLineOption[] = optionDeclarations.filter(option => !!option.affectsSourceFile || !!option.affectsModuleResolution || !!option.affectsBindDiagnostics);
1577+
export const sourceFileAffectingCompilerOptions: readonly CommandLineOption[] = optionDeclarations.filter(option => !!option.affectsSourceFile || !!option.affectsBindDiagnostics);
15681578

15691579
/** @internal */
15701580
export const optionsAffectingProgramStructure: readonly CommandLineOption[] = optionDeclarations.filter(option => !!option.affectsProgramStructure);

‎src/compiler/diagnosticMessages.json

+8-4
Original file line numberDiff line numberDiff line change
@@ -3663,18 +3663,22 @@
36633663
"category": "Error",
36643664
"code": 2854
36653665
},
3666-
"The left-hand side of an 'instanceof' expression must be assignable to the first argument of the right-hand side's '[Symbol.hasInstance]' method.": {
3666+
"Class field '{0}' defined by the parent class is not accessible in the child class via super.": {
36673667
"category": "Error",
36683668
"code": 2855
36693669
},
3670-
"An object's '[Symbol.hasInstance]' method must return a boolean value for it to be used on the right-hand side of an 'instanceof' expression.": {
3670+
"The left-hand side of an 'instanceof' expression must be assignable to the first argument of the right-hand side's '[Symbol.hasInstance]' method.": {
36713671
"category": "Error",
36723672
"code": 2856
36733673
},
3674-
"The right-hand side of an 'instanceof' expression must be either of type 'any', a class, function, or other type assignable to the 'Function' interface type, or an object type with a 'Symbol.hasInstance' method.": {
3674+
"An object's '[Symbol.hasInstance]' method must return a boolean value for it to be used on the right-hand side of an 'instanceof' expression.": {
36753675
"category": "Error",
36763676
"code": 2857
36773677
},
3678+
"The right-hand side of an 'instanceof' expression must be either of type 'any', a class, function, or other type assignable to the 'Function' interface type, or an object type with a 'Symbol.hasInstance' method.": {
3679+
"category": "Error",
3680+
"code": 2858
3681+
},
36783682

36793683
"Import declaration '{0}' is using private name '{1}'.": {
36803684
"category": "Error",
@@ -7576,7 +7580,7 @@
75767580
"category": "Message",
75777581
"code": 95153
75787582
},
7579-
"Can only convert string concatenation": {
7583+
"Can only convert string concatenations and string literals": {
75807584
"category": "Message",
75817585
"code": 95154
75827586
},

‎src/compiler/emitter.ts

+14-1
Original file line numberDiff line numberDiff line change
@@ -927,6 +927,7 @@ export function emitFiles(resolver: EmitResolver, host: EmitHost, targetSourceFi
927927
inlineSourceMap: compilerOptions.inlineSourceMap,
928928
extendedDiagnostics: compilerOptions.extendedDiagnostics,
929929
onlyPrintJsDocStyle: true,
930+
omitBraceSourceMapPositions: true,
930931
writeBundleFileInfo: !!bundleBuildInfo,
931932
recordInternalSection: !!bundleBuildInfo,
932933
relativeToBuildInfo,
@@ -1391,6 +1392,7 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri
13911392
} = handlers;
13921393

13931394
var extendedDiagnostics = !!printerOptions.extendedDiagnostics;
1395+
var omitBraceSourcePositions = !!printerOptions.omitBraceSourceMapPositions;
13941396
var newLine = getNewLineCharacter(printerOptions);
13951397
var moduleKind = getEmitModuleKind(printerOptions);
13961398
var bundledHelpers = new Map<string, boolean>();
@@ -3578,7 +3580,18 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri
35783580
decreaseIndent();
35793581
}
35803582
}
3581-
pos = writeTokenText(token, writer, pos);
3583+
3584+
// We don't emit source positions for most tokens as it tends to be quite noisy, however
3585+
// we need to emit source positions for open and close braces so that tools like istanbul
3586+
// can map branches for code coverage. However, we still omit brace source positions when
3587+
// the output is a declaration file.
3588+
if (!omitBraceSourcePositions && (token === SyntaxKind.OpenBraceToken || token === SyntaxKind.CloseBraceToken)) {
3589+
pos = writeToken(token, pos, writer, contextNode);
3590+
}
3591+
else {
3592+
pos = writeTokenText(token, writer, pos);
3593+
}
3594+
35823595
if (isSimilarNode && contextNode.end !== pos) {
35833596
const isJsxExprContext = contextNode.kind === SyntaxKind.JsxExpression;
35843597
emitTrailingCommentsOfPosition(pos, /*prefixSpace*/ !isJsxExprContext, /*forceNoNewline*/ isJsxExprContext);

‎src/compiler/factory/nodeFactory.ts

-1
Original file line numberDiff line numberDiff line change
@@ -6026,7 +6026,6 @@ export function createNodeFactory(flags: NodeFactoryFlags, baseFactory: BaseNode
60266026
node.imports = undefined!;
60276027
node.moduleAugmentations = undefined!;
60286028
node.ambientModuleNames = undefined!;
6029-
node.resolvedModules = undefined;
60306029
node.classifiableNames = undefined;
60316030
node.impliedNodeFormat = undefined;
60326031
return node;

0 commit comments

Comments
 (0)