Skip to content

Commit e286821

Browse files
DanielRosenwasserDanielRosenwasser
authored
Bump version to 4.9.4 and LKG.
1 parent eb5419f commit e286821

File tree

8 files changed

+167
-104
lines changed

8 files changed

+167
-104
lines changed

‎lib/tsc.js‎

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
6969
var ts;
7070
(function (ts) {
7171
ts.versionMajorMinor = "4.9";
72-
ts.version = "".concat(ts.versionMajorMinor, ".3");
72+
ts.version = "".concat(ts.versionMajorMinor, ".4");
7373
var NativeCollections;
7474
(function (NativeCollections) {
7575
var globals = typeof globalThis !== "undefined" ? globalThis :
@@ -57536,7 +57536,8 @@ var ts;
5753657536
return !!(type.flags & 109440);
5753757537
}
5753857538
function isUnitLikeType(type) {
57539-
return isUnitType(getBaseConstraintOrType(type));
57539+
var t = getBaseConstraintOrType(type);
57540+
return t.flags & 2097152 ? ts.some(t.types, isUnitType) : isUnitType(t);
5754057541
}
5754157542
function extractUnitType(type) {
5754257543
return type.flags & 2097152 ? ts.find(type.types, isUnitType) || type : type;
@@ -66236,11 +66237,11 @@ var ts;
6623666237
}
6623766238
function checkSatisfiesExpression(node) {
6623866239
checkSourceElement(node.type);
66240+
var exprType = checkExpression(node.expression);
6623966241
var targetType = getTypeFromTypeNode(node.type);
6624066242
if (isErrorType(targetType)) {
6624166243
return targetType;
6624266244
}
66243-
var exprType = checkExpression(node.expression);
6624466245
checkTypeAssignableToAndOptionallyElaborate(exprType, targetType, node.type, node.expression, ts.Diagnostics.Type_0_does_not_satisfy_the_expected_type_1);
6624566246
return exprType;
6624666247
}
@@ -77596,8 +77597,8 @@ var ts;
7759677597
_a[302] = function visitEachChildOfEnumMember(node, visitor, context, _nodesVisitor, nodeVisitor, _tokenVisitor) {
7759777598
return context.factory.updateEnumMember(node, nodeVisitor(node.name, visitor, ts.isPropertyName), nodeVisitor(node.initializer, visitor, ts.isExpression));
7759877599
},
77599-
_a[308] = function visitEachChildOfSourceFile(node, visitor, context, nodesVisitor, _nodeVisitor, _tokenVisitor) {
77600-
return context.factory.updateSourceFile(node, visitLexicalEnvironment(node.statements, visitor, context, undefined, undefined, nodesVisitor));
77600+
_a[308] = function visitEachChildOfSourceFile(node, visitor, context, _nodesVisitor, _nodeVisitor, _tokenVisitor) {
77601+
return context.factory.updateSourceFile(node, visitLexicalEnvironment(node.statements, visitor, context));
7760177602
},
7760277603
_a[353] = function visitEachChildOfPartiallyEmittedExpression(node, visitor, context, _nodesVisitor, nodeVisitor, _tokenVisitor) {
7760377604
return context.factory.updatePartiallyEmittedExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression));
@@ -104718,12 +104719,13 @@ var ts;
104718104719
if (directoryStructureHost === void 0) { directoryStructureHost = host; }
104719104720
var useCaseSensitiveFileNames = host.useCaseSensitiveFileNames();
104720104721
var hostGetNewLine = ts.memoize(function () { return host.getNewLine(); });
104721-
return {
104722+
var compilerHost = {
104722104723
getSourceFile: function (fileName, languageVersionOrOptions, onError) {
104723104724
var text;
104724104725
try {
104725104726
ts.performance.mark("beforeIORead");
104726-
text = host.readFile(fileName, getCompilerOptions().charset);
104727+
var encoding = getCompilerOptions().charset;
104728+
text = !encoding ? compilerHost.readFile(fileName) : host.readFile(fileName, encoding);
104727104729
ts.performance.mark("afterIORead");
104728104730
ts.performance.measure("I/O Read", "beforeIORead", "afterIORead");
104729104731
}
@@ -104754,6 +104756,7 @@ var ts;
104754104756
disableUseFileVersionAsSignature: host.disableUseFileVersionAsSignature,
104755104757
storeFilesChangingSignatureDuringEmit: host.storeFilesChangingSignatureDuringEmit,
104756104758
};
104759+
return compilerHost;
104757104760
function writeFile(fileName, text, writeByteOrderMark, onError) {
104758104761
try {
104759104762
ts.performance.mark("beforeIOWrite");
@@ -104769,9 +104772,9 @@ var ts;
104769104772
}
104770104773
}
104771104774
ts.createCompilerHostFromProgramHost = createCompilerHostFromProgramHost;
104772-
function setGetSourceFileAsHashVersioned(compilerHost, host) {
104775+
function setGetSourceFileAsHashVersioned(compilerHost) {
104773104776
var originalGetSourceFile = compilerHost.getSourceFile;
104774-
var computeHash = ts.maybeBind(host, host.createHash) || ts.generateDjb2Hash;
104777+
var computeHash = ts.maybeBind(compilerHost, compilerHost.createHash) || ts.generateDjb2Hash;
104775104778
compilerHost.getSourceFile = function () {
104776104779
var args = [];
104777104780
for (var _i = 0; _i < arguments.length; _i++) {
@@ -104887,7 +104890,7 @@ var ts;
104887104890
host.createHash = ts.maybeBind(system, system.createHash);
104888104891
host.disableUseFileVersionAsSignature = system.disableUseFileVersionAsSignature;
104889104892
host.storeFilesChangingSignatureDuringEmit = system.storeFilesChangingSignatureDuringEmit;
104890-
ts.setGetSourceFileAsHashVersioned(host, system);
104893+
ts.setGetSourceFileAsHashVersioned(host);
104891104894
ts.changeCompilerHostLikeToUseCache(host, function (fileName) { return ts.toPath(fileName, host.getCurrentDirectory(), host.getCanonicalFileName); });
104892104895
return host;
104893104896
}
@@ -104972,7 +104975,7 @@ var ts;
104972104975
configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile);
104973104976
}
104974104977
var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
104975-
ts.setGetSourceFileAsHashVersioned(compilerHost, host);
104978+
ts.setGetSourceFileAsHashVersioned(compilerHost);
104976104979
var getNewSourceFile = compilerHost.getSourceFile;
104977104980
compilerHost.getSourceFile = function (fileName) {
104978104981
var args = [];
@@ -105092,8 +105095,8 @@ var ts;
105092105095
}
105093105096
}
105094105097
var hasInvalidatedResolutions = resolutionCache.createHasInvalidatedResolutions(customHasInvalidatedResolutions);
105095-
var _a = ts.changeCompilerHostLikeToUseCache(compilerHost, toPath), originalReadFile = _a.originalReadFile, originalFileExists = _a.originalFileExists, originalDirectoryExists = _a.originalDirectoryExists, originalCreateDirectory = _a.originalCreateDirectory, originalWriteFile = _a.originalWriteFile;
105096-
if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, function (fileName) { return compilerHost.fileExists(fileName); }, hasInvalidatedResolutions, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
105098+
var _a = ts.changeCompilerHostLikeToUseCache(compilerHost, toPath), originalReadFile = _a.originalReadFile, originalFileExists = _a.originalFileExists, originalDirectoryExists = _a.originalDirectoryExists, originalCreateDirectory = _a.originalCreateDirectory, originalWriteFile = _a.originalWriteFile, readFileWithCache = _a.readFileWithCache;
105099+
if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, function (path) { return getSourceVersion(path, readFileWithCache); }, function (fileName) { return compilerHost.fileExists(fileName); }, hasInvalidatedResolutions, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
105097105100
if (hasChangedConfigFileParsingErrors) {
105098105101
if (reportFileChangeDetectedOnCreateProgram) {
105099105102
reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
@@ -105218,9 +105221,14 @@ var ts;
105218105221
}
105219105222
}
105220105223
}
105221-
function getSourceVersion(path) {
105224+
function getSourceVersion(path, readFileWithCache) {
105222105225
var hostSourceFile = sourceFilesCache.get(path);
105223-
return !hostSourceFile || !hostSourceFile.version ? undefined : hostSourceFile.version;
105226+
if (!hostSourceFile)
105227+
return undefined;
105228+
if (hostSourceFile.version)
105229+
return hostSourceFile.version;
105230+
var text = readFileWithCache(path);
105231+
return text !== undefined ? (compilerHost.createHash || ts.generateDjb2Hash)(text) : undefined;
105224105232
}
105225105233
function onReleaseOldSourceFile(oldSourceFile, _oldOptions, hasSourceFileByPath) {
105226105234
var hostSourceFileInfo = sourceFilesCache.get(oldSourceFile.resolvedPath);
@@ -105652,7 +105660,7 @@ var ts;
105652105660
var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames());
105653105661
var baseCompilerOptions = getCompilerOptionsOfBuildOptions(options);
105654105662
var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return state.projectCompilerOptions; });
105655-
ts.setGetSourceFileAsHashVersioned(compilerHost, host);
105663+
ts.setGetSourceFileAsHashVersioned(compilerHost);
105656105664
compilerHost.getParsedCommandLine = function (fileName) { return parseConfigFile(state, fileName, toResolvedConfigFilePath(state, fileName)); };
105657105665
compilerHost.resolveModuleNames = ts.maybeBind(host, host.resolveModuleNames);
105658105666
compilerHost.resolveTypeReferenceDirectives = ts.maybeBind(host, host.resolveTypeReferenceDirectives);
@@ -106634,7 +106642,7 @@ var ts;
106634106642
buildInfoVersionMap = ts.getBuildInfoFileVersionMap(buildInfoProgram, buildInfoPath, host);
106635106643
version_3 = buildInfoVersionMap.get(toPath(state, inputFile));
106636106644
var text = version_3 ? state.readFileWithCache(inputFile) : undefined;
106637-
currentVersion = text && (host.createHash || ts.generateDjb2Hash)(text);
106645+
currentVersion = text !== undefined ? (host.createHash || ts.generateDjb2Hash)(text) : undefined;
106638106646
if (version_3 && version_3 === currentVersion)
106639106647
pseudoInputUpToDate = true;
106640106648
}

‎lib/tsserver.js‎

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ var ts;
109109
// The following is baselined as a literal template type without intervention
110110
/** The version of the TypeScript compiler release */
111111
// eslint-disable-next-line @typescript-eslint/no-inferrable-types
112-
ts.version = "".concat(ts.versionMajorMinor, ".3");
112+
ts.version = "".concat(ts.versionMajorMinor, ".4");
113113
/* @internal */
114114
var Comparison;
115115
(function (Comparison) {
@@ -68904,7 +68904,10 @@ var ts;
6890468904
return !!(type.flags & 109440 /* TypeFlags.Unit */);
6890568905
}
6890668906
function isUnitLikeType(type) {
68907-
return isUnitType(getBaseConstraintOrType(type));
68907+
// Intersections that reduce to 'never' (e.g. 'T & null' where 'T extends {}') are not unit types.
68908+
var t = getBaseConstraintOrType(type);
68909+
// Scan intersections such that tagged literal types are considered unit types.
68910+
return t.flags & 2097152 /* TypeFlags.Intersection */ ? ts.some(t.types, isUnitType) : isUnitType(t);
6890868911
}
6890968912
function extractUnitType(type) {
6891068913
return type.flags & 2097152 /* TypeFlags.Intersection */ ? ts.find(type.types, isUnitType) || type : type;
@@ -79084,11 +79087,11 @@ var ts;
7908479087
}
7908579088
function checkSatisfiesExpression(node) {
7908679089
checkSourceElement(node.type);
79090+
var exprType = checkExpression(node.expression);
7908779091
var targetType = getTypeFromTypeNode(node.type);
7908879092
if (isErrorType(targetType)) {
7908979093
return targetType;
7909079094
}
79091-
var exprType = checkExpression(node.expression);
7909279095
checkTypeAssignableToAndOptionallyElaborate(exprType, targetType, node.type, node.expression, ts.Diagnostics.Type_0_does_not_satisfy_the_expected_type_1);
7909379096
return exprType;
7909479097
}
@@ -91973,8 +91976,8 @@ var ts;
9197391976
return context.factory.updateEnumMember(node, nodeVisitor(node.name, visitor, ts.isPropertyName), nodeVisitor(node.initializer, visitor, ts.isExpression));
9197491977
},
9197591978
// Top-level nodes
91976-
_a[308 /* SyntaxKind.SourceFile */] = function visitEachChildOfSourceFile(node, visitor, context, nodesVisitor, _nodeVisitor, _tokenVisitor) {
91977-
return context.factory.updateSourceFile(node, visitLexicalEnvironment(node.statements, visitor, context, /*start*/ undefined, /*ensureUseStrict*/ undefined, nodesVisitor));
91979+
_a[308 /* SyntaxKind.SourceFile */] = function visitEachChildOfSourceFile(node, visitor, context, _nodesVisitor, _nodeVisitor, _tokenVisitor) {
91980+
return context.factory.updateSourceFile(node, visitLexicalEnvironment(node.statements, visitor, context));
9197891981
},
9197991982
// Transformation nodes
9198091983
_a[353 /* SyntaxKind.PartiallyEmittedExpression */] = function visitEachChildOfPartiallyEmittedExpression(node, visitor, context, _nodesVisitor, nodeVisitor, _tokenVisitor) {
@@ -126211,12 +126214,13 @@ var ts;
126211126214
if (directoryStructureHost === void 0) { directoryStructureHost = host; }
126212126215
var useCaseSensitiveFileNames = host.useCaseSensitiveFileNames();
126213126216
var hostGetNewLine = ts.memoize(function () { return host.getNewLine(); });
126214-
return {
126217+
var compilerHost = {
126215126218
getSourceFile: function (fileName, languageVersionOrOptions, onError) {
126216126219
var text;
126217126220
try {
126218126221
ts.performance.mark("beforeIORead");
126219-
text = host.readFile(fileName, getCompilerOptions().charset);
126222+
var encoding = getCompilerOptions().charset;
126223+
text = !encoding ? compilerHost.readFile(fileName) : host.readFile(fileName, encoding);
126220126224
ts.performance.mark("afterIORead");
126221126225
ts.performance.measure("I/O Read", "beforeIORead", "afterIORead");
126222126226
}
@@ -126247,6 +126251,7 @@ var ts;
126247126251
disableUseFileVersionAsSignature: host.disableUseFileVersionAsSignature,
126248126252
storeFilesChangingSignatureDuringEmit: host.storeFilesChangingSignatureDuringEmit,
126249126253
};
126254+
return compilerHost;
126250126255
function writeFile(fileName, text, writeByteOrderMark, onError) {
126251126256
try {
126252126257
ts.performance.mark("beforeIOWrite");
@@ -126265,9 +126270,9 @@ var ts;
126265126270
}
126266126271
}
126267126272
ts.createCompilerHostFromProgramHost = createCompilerHostFromProgramHost;
126268-
function setGetSourceFileAsHashVersioned(compilerHost, host) {
126273+
function setGetSourceFileAsHashVersioned(compilerHost) {
126269126274
var originalGetSourceFile = compilerHost.getSourceFile;
126270-
var computeHash = ts.maybeBind(host, host.createHash) || ts.generateDjb2Hash;
126275+
var computeHash = ts.maybeBind(compilerHost, compilerHost.createHash) || ts.generateDjb2Hash;
126271126276
compilerHost.getSourceFile = function () {
126272126277
var args = [];
126273126278
for (var _i = 0; _i < arguments.length; _i++) {
@@ -126399,7 +126404,7 @@ var ts;
126399126404
host.createHash = ts.maybeBind(system, system.createHash);
126400126405
host.disableUseFileVersionAsSignature = system.disableUseFileVersionAsSignature;
126401126406
host.storeFilesChangingSignatureDuringEmit = system.storeFilesChangingSignatureDuringEmit;
126402-
ts.setGetSourceFileAsHashVersioned(host, system);
126407+
ts.setGetSourceFileAsHashVersioned(host);
126403126408
ts.changeCompilerHostLikeToUseCache(host, function (fileName) { return ts.toPath(fileName, host.getCurrentDirectory(), host.getCanonicalFileName); });
126404126409
return host;
126405126410
}
@@ -126485,7 +126490,7 @@ var ts;
126485126490
configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile);
126486126491
}
126487126492
var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
126488-
ts.setGetSourceFileAsHashVersioned(compilerHost, host);
126493+
ts.setGetSourceFileAsHashVersioned(compilerHost);
126489126494
// Members for CompilerHost
126490126495
var getNewSourceFile = compilerHost.getSourceFile;
126491126496
compilerHost.getSourceFile = function (fileName) {
@@ -126613,8 +126618,8 @@ var ts;
126613126618
}
126614126619
}
126615126620
var hasInvalidatedResolutions = resolutionCache.createHasInvalidatedResolutions(customHasInvalidatedResolutions);
126616-
var _a = ts.changeCompilerHostLikeToUseCache(compilerHost, toPath), originalReadFile = _a.originalReadFile, originalFileExists = _a.originalFileExists, originalDirectoryExists = _a.originalDirectoryExists, originalCreateDirectory = _a.originalCreateDirectory, originalWriteFile = _a.originalWriteFile;
126617-
if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, function (fileName) { return compilerHost.fileExists(fileName); }, hasInvalidatedResolutions, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
126621+
var _a = ts.changeCompilerHostLikeToUseCache(compilerHost, toPath), originalReadFile = _a.originalReadFile, originalFileExists = _a.originalFileExists, originalDirectoryExists = _a.originalDirectoryExists, originalCreateDirectory = _a.originalCreateDirectory, originalWriteFile = _a.originalWriteFile, readFileWithCache = _a.readFileWithCache;
126622+
if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, function (path) { return getSourceVersion(path, readFileWithCache); }, function (fileName) { return compilerHost.fileExists(fileName); }, hasInvalidatedResolutions, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
126618126623
if (hasChangedConfigFileParsingErrors) {
126619126624
if (reportFileChangeDetectedOnCreateProgram) {
126620126625
reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
@@ -126753,9 +126758,15 @@ var ts;
126753126758
}
126754126759
}
126755126760
}
126756-
function getSourceVersion(path) {
126761+
function getSourceVersion(path, readFileWithCache) {
126757126762
var hostSourceFile = sourceFilesCache.get(path);
126758-
return !hostSourceFile || !hostSourceFile.version ? undefined : hostSourceFile.version;
126763+
if (!hostSourceFile)
126764+
return undefined;
126765+
if (hostSourceFile.version)
126766+
return hostSourceFile.version;
126767+
// Read file and get new version
126768+
var text = readFileWithCache(path);
126769+
return text !== undefined ? (compilerHost.createHash || ts.generateDjb2Hash)(text) : undefined;
126759126770
}
126760126771
function onReleaseOldSourceFile(oldSourceFile, _oldOptions, hasSourceFileByPath) {
126761126772
var hostSourceFileInfo = sourceFilesCache.get(oldSourceFile.resolvedPath);
@@ -127249,7 +127260,7 @@ var ts;
127249127260
// State of the solution
127250127261
var baseCompilerOptions = getCompilerOptionsOfBuildOptions(options);
127251127262
var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return state.projectCompilerOptions; });
127252-
ts.setGetSourceFileAsHashVersioned(compilerHost, host);
127263+
ts.setGetSourceFileAsHashVersioned(compilerHost);
127253127264
compilerHost.getParsedCommandLine = function (fileName) { return parseConfigFile(state, fileName, toResolvedConfigFilePath(state, fileName)); };
127254127265
compilerHost.resolveModuleNames = ts.maybeBind(host, host.resolveModuleNames);
127255127266
compilerHost.resolveTypeReferenceDirectives = ts.maybeBind(host, host.resolveTypeReferenceDirectives);
@@ -128282,7 +128293,7 @@ var ts;
128282128293
buildInfoVersionMap = ts.getBuildInfoFileVersionMap(buildInfoProgram, buildInfoPath, host);
128283128294
version_3 = buildInfoVersionMap.get(toPath(state, inputFile));
128284128295
var text = version_3 ? state.readFileWithCache(inputFile) : undefined;
128285-
currentVersion = text && (host.createHash || ts.generateDjb2Hash)(text);
128296+
currentVersion = text !== undefined ? (host.createHash || ts.generateDjb2Hash)(text) : undefined;
128286128297
if (version_3 && version_3 === currentVersion)
128287128298
pseudoInputUpToDate = true;
128288128299
}

0 commit comments

Comments
 (0)