foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-25 15:29:32 -05:00
Code Issues Packages 1 Wiki Activity

fix: upgrade to TS 4.9.4 (#17048)

Browse source
This commit is contained in:
David Sherret 2022-12-14 13:00:51 -05:00 committed by GitHub
parent 4a64ca8501
commit 9e9e8f1e38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cli/build.rs
View file

@ -130,6 +130,14 @@ mod ts {
path_dts.join(format!("lib.{}.d.ts", name)).display() path_dts.join(format!("lib.{}.d.ts", name)).display()
); );
} }
println!(
"cargo:rerun-if-changed={}",
cwd.join("tsc").join("00_typescript.js").display()
);
println!(
"cargo:rerun-if-changed={}",
cwd.join("tsc").join("99_main_compiler.js").display()
);
println!( println!(
"cargo:rerun-if-changed={}", "cargo:rerun-if-changed={}",
cwd.join("js").join("40_testing.js").display() cwd.join("js").join("40_testing.js").display()

2
cli/tests/unit/version_test.ts
View file

@ -4,5 +4,5 @@ Deno.test(function version() {
const pattern = /^\d+\.\d+\.\d+/; const pattern = /^\d+\.\d+\.\d+/;
assert(pattern.test(Deno.version.deno)); assert(pattern.test(Deno.version.deno));
assert(pattern.test(Deno.version.v8)); assert(pattern.test(Deno.version.v8));
assertEquals(Deno.version.typescript, "4.9.3"); assertEquals(Deno.version.typescript, "4.9.4");
}); });

45
cli/tsc/00_typescript.js vendored
View file

@ -99,7 +99,7 @@ var ts;
// The following is baselined as a literal template type without intervention // The following is baselined as a literal template type without intervention
/** The version of the TypeScript compiler release */ /** The version of the TypeScript compiler release */
// eslint-disable-next-line @typescript-eslint/no-inferrable-types // eslint-disable-next-line @typescript-eslint/no-inferrable-types
ts.version = "".concat(ts.versionMajorMinor, ".3"); ts.version = "".concat(ts.versionMajorMinor, ".4");
/* @internal */ /* @internal */
var Comparison; var Comparison;
(function (Comparison) { (function (Comparison) {
@ -68946,7 +68946,10 @@ var ts;
return !!(type.flags & 109440 /* TypeFlags.Unit */); return !!(type.flags & 109440 /* TypeFlags.Unit */);
} }
function isUnitLikeType(type) { function isUnitLikeType(type) {
return isUnitType(getBaseConstraintOrType(type)); // Intersections that reduce to 'never' (e.g. 'T & null' where 'T extends {}') are not unit types.
var t = getBaseConstraintOrType(type);
// Scan intersections such that tagged literal types are considered unit types.
return t.flags & 2097152 /* TypeFlags.Intersection */ ? ts.some(t.types, isUnitType) : isUnitType(t);
} }
function extractUnitType(type) { function extractUnitType(type) {
return type.flags & 2097152 /* TypeFlags.Intersection */ ? ts.find(type.types, isUnitType) || type : type; return type.flags & 2097152 /* TypeFlags.Intersection */ ? ts.find(type.types, isUnitType) || type : type;
@ -79134,11 +79137,11 @@ var ts;
} }
function checkSatisfiesExpression(node) { function checkSatisfiesExpression(node) {
checkSourceElement(node.type); checkSourceElement(node.type);
var exprType = checkExpression(node.expression);
var targetType = getTypeFromTypeNode(node.type); var targetType = getTypeFromTypeNode(node.type);
if (isErrorType(targetType)) { if (isErrorType(targetType)) {
return targetType; return targetType;
} }
var exprType = checkExpression(node.expression);
checkTypeAssignableToAndOptionallyElaborate(exprType, targetType, node.type, node.expression, ts.Diagnostics.Type_0_does_not_satisfy_the_expected_type_1); checkTypeAssignableToAndOptionallyElaborate(exprType, targetType, node.type, node.expression, ts.Diagnostics.Type_0_does_not_satisfy_the_expected_type_1);
return exprType; return exprType;
} }
@ -92279,8 +92282,8 @@ var ts;
return context.factory.updateEnumMember(node, nodeVisitor(node.name, visitor, ts.isPropertyName), nodeVisitor(node.initializer, visitor, ts.isExpression)); return context.factory.updateEnumMember(node, nodeVisitor(node.name, visitor, ts.isPropertyName), nodeVisitor(node.initializer, visitor, ts.isExpression));
}, },
// Top-level nodes // Top-level nodes
_a[308 /* SyntaxKind.SourceFile */] = function visitEachChildOfSourceFile(node, visitor, context, nodesVisitor, _nodeVisitor, _tokenVisitor) { _a[308 /* SyntaxKind.SourceFile */] = function visitEachChildOfSourceFile(node, visitor, context, _nodesVisitor, _nodeVisitor, _tokenVisitor) {
return context.factory.updateSourceFile(node, visitLexicalEnvironment(node.statements, visitor, context, /*start*/ undefined, /*ensureUseStrict*/ undefined, nodesVisitor)); return context.factory.updateSourceFile(node, visitLexicalEnvironment(node.statements, visitor, context));
}, },
// Transformation nodes // Transformation nodes
_a[353 /* SyntaxKind.PartiallyEmittedExpression */] = function visitEachChildOfPartiallyEmittedExpression(node, visitor, context, _nodesVisitor, nodeVisitor, _tokenVisitor) { _a[353 /* SyntaxKind.PartiallyEmittedExpression */] = function visitEachChildOfPartiallyEmittedExpression(node, visitor, context, _nodesVisitor, nodeVisitor, _tokenVisitor) {
@ -126517,12 +126520,13 @@ var ts;
if (directoryStructureHost === void 0) { directoryStructureHost = host; } if (directoryStructureHost === void 0) { directoryStructureHost = host; }
var useCaseSensitiveFileNames = host.useCaseSensitiveFileNames(); var useCaseSensitiveFileNames = host.useCaseSensitiveFileNames();
var hostGetNewLine = ts.memoize(function () { return host.getNewLine(); }); var hostGetNewLine = ts.memoize(function () { return host.getNewLine(); });
return { var compilerHost = {
getSourceFile: function (fileName, languageVersionOrOptions, onError) { getSourceFile: function (fileName, languageVersionOrOptions, onError) {
var text; var text;
try { try {
ts.performance.mark("beforeIORead"); ts.performance.mark("beforeIORead");
text = host.readFile(fileName, getCompilerOptions().charset); var encoding = getCompilerOptions().charset;
text = !encoding ? compilerHost.readFile(fileName) : host.readFile(fileName, encoding);
ts.performance.mark("afterIORead"); ts.performance.mark("afterIORead");
ts.performance.measure("I/O Read", "beforeIORead", "afterIORead"); ts.performance.measure("I/O Read", "beforeIORead", "afterIORead");
} }
@ -126553,6 +126557,7 @@ var ts;
disableUseFileVersionAsSignature: host.disableUseFileVersionAsSignature, disableUseFileVersionAsSignature: host.disableUseFileVersionAsSignature,
storeFilesChangingSignatureDuringEmit: host.storeFilesChangingSignatureDuringEmit, storeFilesChangingSignatureDuringEmit: host.storeFilesChangingSignatureDuringEmit,
}; };
return compilerHost;
function writeFile(fileName, text, writeByteOrderMark, onError) { function writeFile(fileName, text, writeByteOrderMark, onError) {
try { try {
ts.performance.mark("beforeIOWrite"); ts.performance.mark("beforeIOWrite");
@ -126571,9 +126576,9 @@ var ts;
} }
} }
ts.createCompilerHostFromProgramHost = createCompilerHostFromProgramHost; ts.createCompilerHostFromProgramHost = createCompilerHostFromProgramHost;
function setGetSourceFileAsHashVersioned(compilerHost, host) { function setGetSourceFileAsHashVersioned(compilerHost) {
var originalGetSourceFile = compilerHost.getSourceFile; var originalGetSourceFile = compilerHost.getSourceFile;
var computeHash = ts.maybeBind(host, host.createHash) || ts.generateDjb2Hash; var computeHash = ts.maybeBind(compilerHost, compilerHost.createHash) || ts.generateDjb2Hash;
compilerHost.getSourceFile = function () { compilerHost.getSourceFile = function () {
var args = []; var args = [];
for (var _i = 0; _i < arguments.length; _i++) { for (var _i = 0; _i < arguments.length; _i++) {
@ -126705,7 +126710,7 @@ var ts;
host.createHash = ts.maybeBind(system, system.createHash); host.createHash = ts.maybeBind(system, system.createHash);
host.disableUseFileVersionAsSignature = system.disableUseFileVersionAsSignature; host.disableUseFileVersionAsSignature = system.disableUseFileVersionAsSignature;
host.storeFilesChangingSignatureDuringEmit = system.storeFilesChangingSignatureDuringEmit; host.storeFilesChangingSignatureDuringEmit = system.storeFilesChangingSignatureDuringEmit;
ts.setGetSourceFileAsHashVersioned(host, system); ts.setGetSourceFileAsHashVersioned(host);
ts.changeCompilerHostLikeToUseCache(host, function (fileName) { return ts.toPath(fileName, host.getCurrentDirectory(), host.getCanonicalFileName); }); ts.changeCompilerHostLikeToUseCache(host, function (fileName) { return ts.toPath(fileName, host.getCurrentDirectory(), host.getCanonicalFileName); });
return host; return host;
} }
@ -126791,7 +126796,7 @@ var ts;
configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile); configFileWatcher = watchFile(configFileName, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ConfigFile);
} }
var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost); var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
ts.setGetSourceFileAsHashVersioned(compilerHost, host); ts.setGetSourceFileAsHashVersioned(compilerHost);
// Members for CompilerHost // Members for CompilerHost
var getNewSourceFile = compilerHost.getSourceFile; var getNewSourceFile = compilerHost.getSourceFile;
compilerHost.getSourceFile = function (fileName) { compilerHost.getSourceFile = function (fileName) {
@ -126919,8 +126924,8 @@ var ts;
} }
} }
var hasInvalidatedResolutions = resolutionCache.createHasInvalidatedResolutions(customHasInvalidatedResolutions); var hasInvalidatedResolutions = resolutionCache.createHasInvalidatedResolutions(customHasInvalidatedResolutions);
var _a = ts.changeCompilerHostLikeToUseCache(compilerHost, toPath), originalReadFile = _a.originalReadFile, originalFileExists = _a.originalFileExists, originalDirectoryExists = _a.originalDirectoryExists, originalCreateDirectory = _a.originalCreateDirectory, originalWriteFile = _a.originalWriteFile; var _a = ts.changeCompilerHostLikeToUseCache(compilerHost, toPath), originalReadFile = _a.originalReadFile, originalFileExists = _a.originalFileExists, originalDirectoryExists = _a.originalDirectoryExists, originalCreateDirectory = _a.originalCreateDirectory, originalWriteFile = _a.originalWriteFile, readFileWithCache = _a.readFileWithCache;
if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, function (fileName) { return compilerHost.fileExists(fileName); }, hasInvalidatedResolutions, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) { if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, function (path) { return getSourceVersion(path, readFileWithCache); }, function (fileName) { return compilerHost.fileExists(fileName); }, hasInvalidatedResolutions, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
if (hasChangedConfigFileParsingErrors) { if (hasChangedConfigFileParsingErrors) {
if (reportFileChangeDetectedOnCreateProgram) { if (reportFileChangeDetectedOnCreateProgram) {
reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation); reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
@ -127059,9 +127064,15 @@ var ts;
} }
} }
} }
function getSourceVersion(path) { function getSourceVersion(path, readFileWithCache) {
var hostSourceFile = sourceFilesCache.get(path); var hostSourceFile = sourceFilesCache.get(path);
return !hostSourceFile || !hostSourceFile.version ? undefined : hostSourceFile.version; if (!hostSourceFile)
return undefined;
if (hostSourceFile.version)
return hostSourceFile.version;
// Read file and get new version
var text = readFileWithCache(path);
return text !== undefined ? (compilerHost.createHash || ts.generateDjb2Hash)(text) : undefined;
} }
function onReleaseOldSourceFile(oldSourceFile, _oldOptions, hasSourceFileByPath) { function onReleaseOldSourceFile(oldSourceFile, _oldOptions, hasSourceFileByPath) {
var hostSourceFileInfo = sourceFilesCache.get(oldSourceFile.resolvedPath); var hostSourceFileInfo = sourceFilesCache.get(oldSourceFile.resolvedPath);
@ -127555,7 +127566,7 @@ var ts;
// State of the solution // State of the solution
var baseCompilerOptions = getCompilerOptionsOfBuildOptions(options); var baseCompilerOptions = getCompilerOptionsOfBuildOptions(options);
var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return state.projectCompilerOptions; }); var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return state.projectCompilerOptions; });
ts.setGetSourceFileAsHashVersioned(compilerHost, host); ts.setGetSourceFileAsHashVersioned(compilerHost);
compilerHost.getParsedCommandLine = function (fileName) { return parseConfigFile(state, fileName, toResolvedConfigFilePath(state, fileName)); }; compilerHost.getParsedCommandLine = function (fileName) { return parseConfigFile(state, fileName, toResolvedConfigFilePath(state, fileName)); };
compilerHost.resolveModuleNames = ts.maybeBind(host, host.resolveModuleNames); compilerHost.resolveModuleNames = ts.maybeBind(host, host.resolveModuleNames);
compilerHost.resolveTypeReferenceDirectives = ts.maybeBind(host, host.resolveTypeReferenceDirectives); compilerHost.resolveTypeReferenceDirectives = ts.maybeBind(host, host.resolveTypeReferenceDirectives);
@ -128588,7 +128599,7 @@ var ts;
buildInfoVersionMap = ts.getBuildInfoFileVersionMap(buildInfoProgram, buildInfoPath, host); buildInfoVersionMap = ts.getBuildInfoFileVersionMap(buildInfoProgram, buildInfoPath, host);
version_3 = buildInfoVersionMap.get(toPath(state, inputFile)); version_3 = buildInfoVersionMap.get(toPath(state, inputFile));
var text = version_3 ? state.readFileWithCache(inputFile) : undefined; var text = version_3 ? state.readFileWithCache(inputFile) : undefined;
currentVersion = text && (host.createHash || ts.generateDjb2Hash)(text); currentVersion = text !== undefined ? (host.createHash || ts.generateDjb2Hash)(text) : undefined;
if (version_3 && version_3 === currentVersion) if (version_3 && version_3 === currentVersion)
pseudoInputUpToDate = true; pseudoInputUpToDate = true;
} }