diff --git a/package.json b/package.json index f5e4ea0d3..779795d3e 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "smol-toml": "1.3.0", "strip-ansi": "7.1.0", "to-fast-properties": "4.0.0", - "typescript": "5.5.4", + "typescript": "5.6.2", "unicode-regex": "4.0.0", "unified": "9.2.2", "url-or-path": "2.3.0", diff --git a/scripts/build/modify-typescript-module.js b/scripts/build/modify-typescript-module.js index c6c700514..7a93bd891 100644 --- a/scripts/build/modify-typescript-module.js +++ b/scripts/build/modify-typescript-module.js @@ -272,12 +272,6 @@ function modifyTypescriptModule(text) { source.replaceModule("src/compiler/sys.ts", "var sys;"); source.replaceModule("src/compiler/tracing.ts", "var tracing;"); - // perfLogger - source.replaceModule( - "src/compiler/perfLogger.ts", - "var perfLogger = new Proxy(() => {}, {get: () => perfLogger});", - ); - // performance source.replaceModule( "src/compiler/performanceCore.ts", diff --git a/scripts/build/typescript-unused-specifiers.js b/scripts/build/typescript-unused-specifiers.js index d2c9b323f..9775f242a 100644 --- a/scripts/build/typescript-unused-specifiers.js +++ b/scripts/build/typescript-unused-specifiers.js @@ -23,7 +23,6 @@ export default new Set([ "GoToDefinition", "HighlightSpanKind", "IdentifierNameMap", - "IdentifierNameMultiMap", "ImportKind", "IndentStyle", "InlayHintKind", @@ -72,7 +71,6 @@ export default new Set([ "WatchLogLevel", "WatchType", "accessPrivateIdentifier", - "addDisposableResourceHelper", "addEmitFlags", "addEmitHelper", "addEmitHelpers", @@ -83,13 +81,7 @@ export default new Set([ "affectsDeclarationPathOptionDeclarations", "affectsEmitOptionDeclarations", "allKeysStartWithDot", - "assignHelper", - "asyncDelegator", - "asyncGeneratorHelper", "asyncSuperHelper", - "asyncValues", - "awaitHelper", - "awaiterHelper", "bindSourceFile", "breakIntoCharacterSpans", "breakIntoWordSpans", @@ -98,6 +90,7 @@ export default new Set([ "buildOverload", "bundlerModuleNameResolver", "canBeConvertedToAsync", + "canEmitTsBuildInfo", "canJsonReportNoInputFiles", "canProduceDiagnostics", "canWatchAffectingLocation", @@ -108,15 +101,11 @@ export default new Set([ "classHasClassThisAssignment", "classHasDeclaredOrExplicitlyAssignedName", "classHasExplicitlyAssignedName", - "classPrivateFieldGetHelper", - "classPrivateFieldInHelper", - "classPrivateFieldSetHelper", "classicNameResolver", "classifier", "cleanExtendedConfigCache", "clearSharedExtendedConfigFileWatcher", "climbPastPropertyAccess", - "climbPastPropertyOrElementAccess", "cloneCompilerOptions", "closeFileWatcherOf", "codefix", @@ -125,15 +114,11 @@ export default new Set([ "commonOptionsWithBuild", "compareEmitHelpers", "comparePatternKeys", - "compileOnSaveCommandLineOption", "compilerOptionsDidYouMeanDiagnostics", "compilerOptionsIndicateEsModules", "computeCommonSourceDirectoryOfFilenames", - "computeSignature", "computeSignatureWithDiagnostics", "computeSuggestionDiagnostics", - "configDirTemplateSubstitutionOptions", - "configDirTemplateSubstitutionWatchOptions", "consumesNodeCoreModules", "convertCompilerOptionsForTelemetry", "convertCompilerOptionsFromJson", @@ -148,16 +133,11 @@ export default new Set([ "copyTrailingAsLeadingComments", "copyTrailingComments", "createAbstractBuilder", - "createBindingHelper", - "createBuildInfo", "createBuilderProgram", - "createBuilderProgramUsingProgramBuildInfo", + "createBuilderProgramUsingIncrementalBuildInfo", "createBuilderStatusReporter", - "createCacheWithRedirects", "createCacheableExportInfoMap", "createCachedDirectoryStructureHost", - "createClassNamedEvaluationHelperBlock", - "createClassThisAssignmentBlock", "createClassifier", "createCompilerDiagnosticForInvalidCustomType", "createCompilerHost", @@ -229,13 +209,10 @@ export default new Set([ "createWatchStatusReporter", "createWriteFileMeasuringIO", "decodeMappings", - "decorateHelper", - "defaultIncludeSpec", "defaultInitCompilerOptions", "diagnosticToString", "displayPart", "disposeEmitNodes", - "disposeResourcesHelper", "documentSpansEqual", "dumpTracingLegend", "emitFiles", @@ -244,12 +221,10 @@ export default new Set([ "emitResolverSkipsTypeChecking", "emitSkippedWithNoDiagnostics", "emptyOptions", - "esDecorateHelper", "executeCommandLine", "explainFiles", "explainIfFileIsRedirectAndImpliedFormat", - "exportStarHelper", - "extendsHelper", + "fileContainsPackageImport", "fileIncludeReasonToDiagnostics", "fileShouldUseJavaScriptRequire", "filterSemanticDiagnostics", @@ -285,13 +260,11 @@ export default new Set([ "formatting", "generateDjb2Hash", "generateTSConfig", - "generatorHelper", "getAdjustedReferenceLocation", "getAdjustedRenameLocation", "getAllDecoratorsOfClass", "getAllDecoratorsOfClassElement", "getAllProjectOutputs", - "getAssignedNameOfIdentifier", "getAutomaticTypeDirectiveNames", "getBuildInfo", "getBuildInfoFileVersionMap", @@ -310,11 +283,11 @@ export default new Set([ "getContainerNode", "getContextualTypeFromParent", "getContextualTypeFromParentOrAncestorTypeNode", - "getCurrentTime", "getDeclarationDiagnostics", "getDefaultFormatCodeSettings", "getDefaultLikeExportInfo", "getDefaultLikeExportNameFromDeclaration", + "getDefaultResolutionModeForFileWorker", "getDiagnosticText", "getDiagnosticsWithinSpan", "getDirectoryToWatchFailedLookupLocation", @@ -324,6 +297,7 @@ export default new Set([ "getEditsForFileRename", "getEffectiveTypeRoots", "getEmitHelpers", + "getEmitModuleFormatOfFileWorker", "getEncodedSemanticClassifications", "getEncodedSyntacticClassifications", "getEntrypointsFromPackageJsonInfo", @@ -343,11 +317,13 @@ export default new Set([ "getIdentifierAutoGenerate", "getIdentifierGeneratedImportReference", "getIdentifierTypeArguments", + "getImpliedNodeFormatForEmitWorker", "getImpliedNodeFormatForFile", "getImpliedNodeFormatForFileWorker", "getImportNeedsImportDefaultHelper", "getImportNeedsImportStarHelper", "getInferredLibraryNameResolveFrom", + "getIsFileExcluded", "getKeyForCompilerOptions", "getLibraryNameFromLibFileName", "getLineInfo", @@ -370,13 +346,13 @@ export default new Set([ "getNameForExportedSymbol", "getNameFromPropertyName", "getNameOfCompilerOptionValue", - "getNamesForExportedSymbol", "getNewLineKind", "getNewLineOrDefaultFromHost", "getNodeId", "getNodeKind", "getNodeModifiers", "getNonAssignmentOperatorForCompoundAssignment", + "getNonIncrementalBuildInfoRoots", "getOptionFromName", "getOptionsForLibraryResolution", "getOptionsNameMap", @@ -388,16 +364,13 @@ export default new Set([ "getOutputFileNames", "getOutputJSFileNameWorker", "getOutputPathsFor", - "getOutputPathsForBundle", - "getPackageJsonInfo", "getPackageJsonTypesVersionsPaths", - "getPackageJsonsVisibleToFile", "getPackageNameFromTypesPackageName", "getPackageScopeForPath", "getParentNodeInSpan", "getParsedCommandLineOfConfigFile", "getPathUpdater", - "getPendingEmitKind", + "getPendingEmitKindWithSeen", "getPossibleGenericSignatures", "getPossibleTypeArgumentsInfo", "getPreEmitDiagnostics", @@ -414,7 +387,6 @@ export default new Set([ "getResolutionDiagnostic", "getResolutionModeOverride", "getRootDirectoryOfResolutionCache", - "getRootPathSplitLength", "getScriptKind", "getSemanticClassifications", "getSnapshotText", @@ -427,7 +399,6 @@ export default new Set([ "getSuperCallFromStatement", "getSwitchedType", "getSymbolId", - "getSymbolParentOrFail", "getSymbolTarget", "getSyntacticClassifications", "getSynthesizedDeepClone", @@ -455,16 +426,12 @@ export default new Set([ "getWatchFactory", "handleNoEmitOptions", "handleWatchOptionsConfigDirTemplateSubstitution", - "hasChildOfKind", "hasDocComment", "hasIndexSignature", "hasPropertyAccessExpressionWithName", - "helperString", "identitySourceMapConsumer", "ignoreSourceNewlines", "ignoredPaths", - "importDefaultHelper", - "importStarHelper", "inferredTypesContainingFile", "injectClassNamedEvaluationHelperBlockIfMissing", "injectClassThisAssignmentIfMissing", @@ -488,7 +455,6 @@ export default new Set([ "isCompoundAssignment", "isDecoratorTarget", "isDeprecatedDeclaration", - "isDiagnosticWithLocation", "isDocumentRegistryEntry", "isEmittedFileOfProgram", "isEqualityOperatorKind", @@ -499,7 +465,6 @@ export default new Set([ "isExternalModuleSymbol", "isFirstDeclarationOfSymbolParameter", "isFixablePromiseHandler", - "isGlobalDeclaration", "isIgnoredFileFromWildCardWatching", "isImportOrExportSpecifierName", "isImportableFile", @@ -510,6 +475,8 @@ export default new Set([ "isInRightSideOfInternalImportEqualsDeclaration", "isInString", "isInTemplateString", + "isIncrementalBuildInfo", + "isIncrementalBundleEmitBuildInfo", "isInitializedProperty", "isInsideJsxElement", "isInsideJsxElementOrAttribute", @@ -526,14 +493,11 @@ export default new Set([ "isNameOfFunctionDeclaration", "isNameOfModuleDeclaration", "isNewExpressionTarget", - "isNonGlobalDeclaration", "isNonStaticMethodOrAccessorWithPrivateName", "isObjectBindingElementWithoutPropertyName", "isPackageJsonInfo", "isPossiblyTypeArgumentPosition", - "isProgramBundleEmitBuildInfo", "isProgramUptoDate", - "isRawSourceMap", "isReferenceFileLocation", "isReferencedFile", "isReturnStatementWithFixablePromiseHandler", @@ -541,7 +505,6 @@ export default new Set([ "isRightSideOfQualifiedName", "isSimpleCopiableExpression", "isSimpleInlineableExpression", - "isSimpleParameter", "isSimpleParameterList", "isSourceFileFromLibrary", "isSourceMapping", @@ -554,17 +517,12 @@ export default new Set([ "isThis", "isTraceEnabled", "isTypeKeyword", - "isTypeKeywordToken", "isTypeKeywordTokenOrIdentifier", "jsxModeNeedsExplicitImport", "keywordPart", "libMap", "libs", "lineBreakPart", - "linkNamePart", - "linkPart", - "linkTextPart", - "listFiles", "loadModuleFromGlobalCache", "loadWithModeAwareCache", "makeImport", @@ -573,7 +531,6 @@ export default new Set([ "mapOneOrMany", "mapToDisplayParts", "matchesExclude", - "metadataHelper", "missingFileModifiedTime", "moduleOptionDeclaration", "moduleResolutionNameAndModeGetter", @@ -595,7 +552,6 @@ export default new Set([ "nodeNextJsonConfigResolver", "nodeOverlapsWithStartEnd", "nodeSeenTracker", - "nodeToDisplayParts", "noopFileWatcher", "notImplementedResolver", "nullNodeConverters", @@ -606,7 +562,6 @@ export default new Set([ "optionsAffectingProgramStructure", "optionsForBuild", "optionsForWatch", - "paramHelper", "parameterNamePart", "parseBuildCommand", "parseCommandLine", @@ -625,7 +580,6 @@ export default new Set([ "pathContainsNodeModules", "performIncrementalCompilation", "performance", - "plainJSErrors", "positionBelongsToNode", "positionIsASICandidate", "preProcessFile", @@ -633,7 +587,6 @@ export default new Set([ "processTaggedTemplateExpression", "programContainsEsModules", "programContainsModules", - "propKeyHelper", "propertyNamePart", "punctuationPart", "quote", @@ -646,13 +599,11 @@ export default new Set([ "rangeOverlapsWithStartEnd", "readBuilderProgram", "readConfigFile", - "readHelper", "readJsonConfigFile", "refactor", "removeAllComments", "removeEmitHelper", "removeIgnoredPath", - "removeOptionality", "repeatString", "resolveConfigFileProjectName", "resolveJSModule", @@ -663,12 +614,9 @@ export default new Set([ "resolveProjectReferencePath", "resolveTripleslashReference", "resolveTypeReferenceDirective", - "restHelper", "returnNoopFileWatcher", "returnsPromise", - "runInitializersHelper", "sameMapping", - "screenStartingMessageCodes", "semanticDiagnosticsOptionDeclarations", "serializeCompilerOptions", "server", @@ -676,13 +624,11 @@ export default new Set([ "setConfigFileInOptions", "setConstantValue", "setEmitFlags", - "setFunctionNameHelper", "setGetSourceFileAsHashVersioned", "setIdentifierAutoGenerate", "setIdentifierGeneratedImportReference", "setIdentifierTypeArguments", "setInternalEmitFlags", - "setModuleDefaultHelper", "setPrivateIdentifier", "setSnippetElement", "setSourceMapRange", @@ -696,7 +642,6 @@ export default new Set([ "setTypeNode", "shouldAllowImportingTsExtension", "shouldUseUriStyleNodeCoreModules", - "signatureHasLiteralTypes", "signatureHasRestParameter", "signatureToDisplayParts", "skipConstraint", @@ -704,7 +649,6 @@ export default new Set([ "sourceMapCommentRegExp", "sourceMapCommentRegExpDontCareLineStart", "spacePart", - "spreadArrayHelper", "startEndContainsRange", "startEndOverlapsWithStartEnd", "startTracing", @@ -715,13 +659,9 @@ export default new Set([ "suppressTrailingTrivia", "symbolEscapedNameNoDefault", "symbolNameNoDefault", - "symbolPart", "symbolToDisplayParts", - "syntaxMayBeASICandidate", - "syntaxRequiresTrailingSemicolonOrASI", "sysLog", "targetOptionDeclaration", - "templateObjectHelper", "testFormatSettings", "textChanges", "textOrKeywordPart", @@ -746,11 +686,11 @@ export default new Set([ "transformESDecorators", "transformESNext", "transformGenerators", + "transformImpliedNodeFormatDependentModule", "transformJsx", "transformLegacyDecorators", "transformModule", "transformNamedEvaluation", - "transformNodeModule", "transformNodes", "transformSystemModule", "transformTypeScript", @@ -763,7 +703,6 @@ export default new Set([ "tryFileExists", "tryGetDirectories", "tryGetSourceMappingURL", - "tryIOAndConsumeErrors", "tryParseRawSourceMap", "tryReadDirectory", "tryReadFile", @@ -779,7 +718,6 @@ export default new Set([ "updateResolutionField", "updateSharedExtendedConfigFileWatcher", "updateWatchingWildcardDirectories", - "valuesHelper", "visitArray", "visitCommaListElements", "visitEachChild", @@ -789,6 +727,5 @@ export default new Set([ "visitNode", "visitNodes", "visitParameterList", - "walkUpLexicalEnvironments", "whitespaceOrMapCommentRegExp", ]); diff --git a/tests/format/js/export-star/__snapshots__/format.test.js.snap b/tests/format/js/export-star/__snapshots__/format.test.js.snap index 473e7b1ba..569a7cad5 100644 --- a/tests/format/js/export-star/__snapshots__/format.test.js.snap +++ b/tests/format/js/export-star/__snapshots__/format.test.js.snap @@ -71,14 +71,6 @@ exports[`export-star-as-string.js [flow] format 1`] = ` 2 |" `; -exports[`export-star-as-string.js [typescript] format 1`] = ` -"Identifier expected. (1:13) -> 1 | export * as 'foo' from 'foo' - | ^ - 2 | -Cause: Identifier expected." -`; - exports[`export-star-as-string.js format 1`] = ` ====================================options===================================== parsers: ["babel", "flow", "typescript"] @@ -100,14 +92,6 @@ exports[`export-star-as-string2.js [flow] format 1`] = ` 2 |" `; -exports[`export-star-as-string2.js [typescript] format 1`] = ` -"Identifier expected. (1:13) -> 1 | export * as "foo" from 'foo' - | ^ - 2 | -Cause: Identifier expected." -`; - exports[`export-star-as-string2.js format 1`] = ` ====================================options===================================== parsers: ["babel", "flow", "typescript"] diff --git a/tests/format/js/export-star/format.test.js b/tests/format/js/export-star/format.test.js index d1f9ed300..2989dce82 100644 --- a/tests/format/js/export-star/format.test.js +++ b/tests/format/js/export-star/format.test.js @@ -1,6 +1,5 @@ runFormatTest(import.meta, ["babel", "flow", "typescript"], { errors: { flow: ["export-star-as-string.js", "export-star-as-string2.js"], - typescript: ["export-star-as-string.js", "export-star-as-string2.js"], }, }); diff --git a/tests/format/js/objects/__snapshots__/format.test.js.snap b/tests/format/js/objects/__snapshots__/format.test.js.snap index 2b7480508..c672fb965 100644 --- a/tests/format/js/objects/__snapshots__/format.test.js.snap +++ b/tests/format/js/objects/__snapshots__/format.test.js.snap @@ -1,15 +1,5 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`bigint-key.js [typescript] format 1`] = ` -"Property assignment expected. (1:6) -> 1 | a = {1n: ""} - | ^ - 2 | a = {1n() {}} - 3 | a = {get 1n() {}} - 4 | -Cause: Property assignment expected." -`; - exports[`bigint-key.js format 1`] = ` ====================================options===================================== parsers: ["babel", "typescript", "flow"] diff --git a/tests/format/js/objects/format.test.js b/tests/format/js/objects/format.test.js index 867f8baa8..76f97b8c7 100644 --- a/tests/format/js/objects/format.test.js +++ b/tests/format/js/objects/format.test.js @@ -2,7 +2,7 @@ runFormatTest(import.meta, ["babel", "typescript", "flow"], { errors: { acorn: ["expression.js"], espree: ["expression.js"], - typescript: ["expression.js", "bigint-key.js"], + typescript: ["expression.js"], meriyah: ["expression.js"], flow: ["expression.js"], }, diff --git a/tests/format/typescript/export/__snapshots__/format.test.js.snap b/tests/format/typescript/export/__snapshots__/format.test.js.snap index cc62d1ffb..0af227165 100644 --- a/tests/format/typescript/export/__snapshots__/format.test.js.snap +++ b/tests/format/typescript/export/__snapshots__/format.test.js.snap @@ -110,7 +110,7 @@ export type * as ns from "./mod"; ================================================================================ `; -exports[`export-type-star-from-2.ts [babel-ts] format 1`] = ` +exports[`export-type-star-from-2.ts format 1`] = ` ====================================options===================================== parsers: ["typescript"] printWidth: 80 @@ -127,13 +127,3 @@ export type * as "ns2" from "./mod"; ================================================================================ `; - -exports[`export-type-star-from-2.ts [typescript] format 1`] = ` -"Identifier expected. (3:18) - 1 | // Note: TSC doesn't support string module specifiers yet, - 2 | // but it's easier for us to support them than not. -> 3 | export type * as "ns2" from './mod'; - | ^ - 4 | -Cause: Identifier expected." -`; diff --git a/tests/format/typescript/export/format.test.js b/tests/format/typescript/export/format.test.js index 9702a9fe2..116dcbd78 100644 --- a/tests/format/typescript/export/format.test.js +++ b/tests/format/typescript/export/format.test.js @@ -1,3 +1 @@ -runFormatTest(import.meta, ["typescript"], { - errors: { typescript: ["export-type-star-from-2.ts"] }, -}); +runFormatTest(import.meta, ["typescript"]); diff --git a/yarn.lock b/yarn.lock index 2b1a14a67..b069fe02e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7338,7 +7338,7 @@ __metadata: tempy: "npm:3.1.0" to-fast-properties: "npm:4.0.0" ts-expect: "npm:1.3.0" - typescript: "npm:5.5.4" + typescript: "npm:5.6.2" unicode-regex: "npm:4.0.0" unified: "npm:9.2.2" url-or-path: "npm:2.3.0" @@ -8643,23 +8643,23 @@ __metadata: languageName: node linkType: hard -"typescript@npm:5.5.4": - version: 5.5.4 - resolution: "typescript@npm:5.5.4" +"typescript@npm:5.6.2": + version: 5.6.2 + resolution: "typescript@npm:5.6.2" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10/1689ccafef894825481fc3d856b4834ba3cc185a9c2878f3c76a9a1ef81af04194849840f3c69e7961e2312771471bb3b460ca92561e1d87599b26c37d0ffb6f + checksum: 10/f95365d4898f357823e93d334ecda9fcade54f009b397c7d05b7621cd9e865981033cf89ccde0f3e3a7b73b1fdbae18e92bc77db237b43e912f053fef0f9a53b languageName: node linkType: hard -"typescript@patch:typescript@npm%3A5.5.4#optional!builtin": - version: 5.5.4 - resolution: "typescript@patch:typescript@npm%3A5.5.4#optional!builtin::version=5.5.4&hash=379a07" +"typescript@patch:typescript@npm%3A5.6.2#optional!builtin": + version: 5.6.2 + resolution: "typescript@patch:typescript@npm%3A5.6.2#optional!builtin::version=5.6.2&hash=8c6c40" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10/746fdd0865c5ce4f15e494c57ede03a9e12ede59cfdb40da3a281807853fe63b00ef1c912d7222143499aa82f18b8b472baa1830df8804746d09b55f6cf5b1cc + checksum: 10/8bfc7ca0d9feca4c3fcbd6c70741abfcd714197d6448e68225ae71e462447d904d3bfba49759a8fbe4956d87f054e2d346833c8349c222daa594a2626d4e1be8 languageName: node linkType: hard