typescript 4.9.0-dev.20220921 → 4.9.0-dev.20220922

package/lib/tsserverlibrary.js

@@ -108,7 +108,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220921");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220922");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -45252,6 +45252,7 @@ var ts;
         }
     }
     function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, nodeModulesDirectory, nodeModulesDirectoryExists, state, cache, redirectedReference) {
+        var _a;
         var candidate = ts.normalizePath(ts.combinePaths(nodeModulesDirectory, moduleName));
         // First look for a nested package.json, as in `node_modules/foo/bar/package.json`.
         var packageInfo = getPackageJsonInfo(candidate, !nodeModulesDirectoryExists, state);
@@ -45266,13 +45267,7 @@ var ts;
                 return withPackageId(packageInfo, fromDirectory);
             }
         }
-        var _a = parsePackageName(moduleName), packageName = _a.packageName, rest = _a.rest;
         var loader = function (extensions, candidate, onlyRecordFailures, state) {
-            var _a;
-            // package exports are higher priority than file/directory lookups (and, if there's exports present, blocks them)
-            if (packageInfo && packageInfo.contents.packageJsonContent.exports && state.features & NodeResolutionFeatures.Exports) {
-                return (_a = loadModuleFromExports(packageInfo, extensions, ts.combinePaths(".", rest), state, cache, redirectedReference)) === null || _a === void 0 ? void 0 : _a.value;
-            }
             var pathAndExtension = loadModuleFromFile(extensions, candidate, onlyRecordFailures, state) ||
                 loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageInfo && packageInfo.contents.packageJsonContent, packageInfo && packageInfo.contents.versionPaths);
             if (!pathAndExtension && packageInfo
@@ -45285,19 +45280,24 @@ var ts;
             }
             return withPackageId(packageInfo, pathAndExtension);
         };
-        if (rest !== "") { // If "rest" is empty, we just did this search above.
-            var packageDirectory = ts.combinePaths(nodeModulesDirectory, packageName);
-            // Don't use a "types" or "main" from here because we're not loading the root, but a subdirectory -- just here for the packageId and path mappings.
+        var _b = parsePackageName(moduleName), packageName = _b.packageName, rest = _b.rest;
+        var packageDirectory = ts.combinePaths(nodeModulesDirectory, packageName);
+        if (rest !== "") {
+            // Previous `packageInfo` may have been from a nested package.json; ensure we have the one from the package root now.
             packageInfo = getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state);
-            if (packageInfo && packageInfo.contents.versionPaths) {
-                if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, packageInfo.contents.versionPaths.version, ts.version, rest);
-                }
-                var packageDirectoryExists = nodeModulesDirectoryExists && ts.directoryProbablyExists(packageDirectory, state.host);
-                var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, packageInfo.contents.versionPaths.paths, /*pathPatterns*/ undefined, loader, !packageDirectoryExists, state);
-                if (fromPaths) {
-                    return fromPaths.value;
-                }
+        }
+        // package exports are higher priority than file/directory/typesVersions lookups and (and, if there's exports present, blocks them)
+        if (packageInfo && packageInfo.contents.packageJsonContent.exports && state.features & NodeResolutionFeatures.Exports) {
+            return (_a = loadModuleFromExports(packageInfo, extensions, ts.combinePaths(".", rest), state, cache, redirectedReference)) === null || _a === void 0 ? void 0 : _a.value;
+        }
+        if (rest !== "" && packageInfo && packageInfo.contents.versionPaths) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, packageInfo.contents.versionPaths.version, ts.version, rest);
+            }
+            var packageDirectoryExists = nodeModulesDirectoryExists && ts.directoryProbablyExists(packageDirectory, state.host);
+            var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, packageInfo.contents.versionPaths.paths, /*pathPatterns*/ undefined, loader, !packageDirectoryExists, state);
+            if (fromPaths) {
+                return fromPaths.value;
             }
         }
         return loader(extensions, candidate, !nodeModulesDirectoryExists, state);
@@ -55478,6 +55478,7 @@ var ts;
                         && symbol.escapedName !== "export=" /* InternalSymbolName.ExportEquals */
                         && !(symbol.flags & 4194304 /* SymbolFlags.Prototype */)
                         && !(symbol.flags & 32 /* SymbolFlags.Class */)
+                        && !(symbol.flags & 8192 /* SymbolFlags.Method */)
                         && !isConstMergedWithNSPrintableAsSignatureMerge) {
                         if (propertyAsAlias) {
                             var createdExport = serializeMaybeAliasAssignment(symbol);
@@ -115412,6 +115413,7 @@ var ts;
             writeTrailingSemicolon();
         }
         function emitExportDeclaration(node) {
+            emitModifiers(node, node.modifiers);
             var nextPos = emitTokenWithComment(93 /* SyntaxKind.ExportKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             if (node.isTypeOnly) {
@@ -146759,6 +146761,10 @@ var ts;
                         pushSelectionCommentRange(comment.pos, comment.end);
                     }
                     if (positionShouldSnapToNode(sourceFile, pos, node)) {
+                        if (ts.isFunctionBody(node)
+                            && ts.isFunctionLikeDeclaration(parentNode) && !ts.positionsAreOnSameLine(node.getStart(sourceFile), node.getEnd(), sourceFile)) {
+                            pushSelectionRange(node.getStart(sourceFile), node.getEnd());
+                        }
                         // 1. Blocks are effectively redundant with SyntaxLists.
                         // 2. TemplateSpans, along with the SyntaxLists containing them, are a somewhat unintuitive grouping
                         //    of things that should be considered independently.
@@ -158371,7 +158377,7 @@ var ts;
                 return { kind: InfoKind.TypeLikeDeclaration, token: token, call: call, modifierFlags: modifierFlags, parentDeclaration: declaration, declSourceFile: declSourceFile, isJSFile: isJSFile };
             }
             var enumDeclaration = ts.find(symbol.declarations, ts.isEnumDeclaration);
-            if (enumDeclaration && !ts.isPrivateIdentifier(token) && !isSourceFileFromLibrary(program, enumDeclaration.getSourceFile())) {
+            if (enumDeclaration && !(leftExpressionType.flags & 1056 /* TypeFlags.EnumLike */) && !ts.isPrivateIdentifier(token) && !isSourceFileFromLibrary(program, enumDeclaration.getSourceFile())) {
                 return { kind: InfoKind.Enum, token: token, parentDeclaration: enumDeclaration };
             }
             return undefined;

package/lib/typescript.js

@@ -99,7 +99,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220921");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220922");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -45243,6 +45243,7 @@ var ts;
         }
     }
     function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, nodeModulesDirectory, nodeModulesDirectoryExists, state, cache, redirectedReference) {
+        var _a;
         var candidate = ts.normalizePath(ts.combinePaths(nodeModulesDirectory, moduleName));
         // First look for a nested package.json, as in `node_modules/foo/bar/package.json`.
         var packageInfo = getPackageJsonInfo(candidate, !nodeModulesDirectoryExists, state);
@@ -45257,13 +45258,7 @@ var ts;
                 return withPackageId(packageInfo, fromDirectory);
             }
         }
-        var _a = parsePackageName(moduleName), packageName = _a.packageName, rest = _a.rest;
         var loader = function (extensions, candidate, onlyRecordFailures, state) {
-            var _a;
-            // package exports are higher priority than file/directory lookups (and, if there's exports present, blocks them)
-            if (packageInfo && packageInfo.contents.packageJsonContent.exports && state.features & NodeResolutionFeatures.Exports) {
-                return (_a = loadModuleFromExports(packageInfo, extensions, ts.combinePaths(".", rest), state, cache, redirectedReference)) === null || _a === void 0 ? void 0 : _a.value;
-            }
             var pathAndExtension = loadModuleFromFile(extensions, candidate, onlyRecordFailures, state) ||
                 loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageInfo && packageInfo.contents.packageJsonContent, packageInfo && packageInfo.contents.versionPaths);
             if (!pathAndExtension && packageInfo
@@ -45276,19 +45271,24 @@ var ts;
             }
             return withPackageId(packageInfo, pathAndExtension);
         };
-        if (rest !== "") { // If "rest" is empty, we just did this search above.
-            var packageDirectory = ts.combinePaths(nodeModulesDirectory, packageName);
-            // Don't use a "types" or "main" from here because we're not loading the root, but a subdirectory -- just here for the packageId and path mappings.
+        var _b = parsePackageName(moduleName), packageName = _b.packageName, rest = _b.rest;
+        var packageDirectory = ts.combinePaths(nodeModulesDirectory, packageName);
+        if (rest !== "") {
+            // Previous `packageInfo` may have been from a nested package.json; ensure we have the one from the package root now.
             packageInfo = getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state);
-            if (packageInfo && packageInfo.contents.versionPaths) {
-                if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, packageInfo.contents.versionPaths.version, ts.version, rest);
-                }
-                var packageDirectoryExists = nodeModulesDirectoryExists && ts.directoryProbablyExists(packageDirectory, state.host);
-                var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, packageInfo.contents.versionPaths.paths, /*pathPatterns*/ undefined, loader, !packageDirectoryExists, state);
-                if (fromPaths) {
-                    return fromPaths.value;
-                }
+        }
+        // package exports are higher priority than file/directory/typesVersions lookups and (and, if there's exports present, blocks them)
+        if (packageInfo && packageInfo.contents.packageJsonContent.exports && state.features & NodeResolutionFeatures.Exports) {
+            return (_a = loadModuleFromExports(packageInfo, extensions, ts.combinePaths(".", rest), state, cache, redirectedReference)) === null || _a === void 0 ? void 0 : _a.value;
+        }
+        if (rest !== "" && packageInfo && packageInfo.contents.versionPaths) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, packageInfo.contents.versionPaths.version, ts.version, rest);
+            }
+            var packageDirectoryExists = nodeModulesDirectoryExists && ts.directoryProbablyExists(packageDirectory, state.host);
+            var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, packageInfo.contents.versionPaths.paths, /*pathPatterns*/ undefined, loader, !packageDirectoryExists, state);
+            if (fromPaths) {
+                return fromPaths.value;
             }
         }
         return loader(extensions, candidate, !nodeModulesDirectoryExists, state);
@@ -55469,6 +55469,7 @@ var ts;
                         && symbol.escapedName !== "export=" /* InternalSymbolName.ExportEquals */
                         && !(symbol.flags & 4194304 /* SymbolFlags.Prototype */)
                         && !(symbol.flags & 32 /* SymbolFlags.Class */)
+                        && !(symbol.flags & 8192 /* SymbolFlags.Method */)
                         && !isConstMergedWithNSPrintableAsSignatureMerge) {
                         if (propertyAsAlias) {
                             var createdExport = serializeMaybeAliasAssignment(symbol);
@@ -115403,6 +115404,7 @@ var ts;
             writeTrailingSemicolon();
         }
         function emitExportDeclaration(node) {
+            emitModifiers(node, node.modifiers);
             var nextPos = emitTokenWithComment(93 /* SyntaxKind.ExportKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             if (node.isTypeOnly) {
@@ -146750,6 +146752,10 @@ var ts;
                         pushSelectionCommentRange(comment.pos, comment.end);
                     }
                     if (positionShouldSnapToNode(sourceFile, pos, node)) {
+                        if (ts.isFunctionBody(node)
+                            && ts.isFunctionLikeDeclaration(parentNode) && !ts.positionsAreOnSameLine(node.getStart(sourceFile), node.getEnd(), sourceFile)) {
+                            pushSelectionRange(node.getStart(sourceFile), node.getEnd());
+                        }
                         // 1. Blocks are effectively redundant with SyntaxLists.
                         // 2. TemplateSpans, along with the SyntaxLists containing them, are a somewhat unintuitive grouping
                         //    of things that should be considered independently.
@@ -158362,7 +158368,7 @@ var ts;
                 return { kind: InfoKind.TypeLikeDeclaration, token: token, call: call, modifierFlags: modifierFlags, parentDeclaration: declaration, declSourceFile: declSourceFile, isJSFile: isJSFile };
             }
             var enumDeclaration = ts.find(symbol.declarations, ts.isEnumDeclaration);
-            if (enumDeclaration && !ts.isPrivateIdentifier(token) && !isSourceFileFromLibrary(program, enumDeclaration.getSourceFile())) {
+            if (enumDeclaration && !(leftExpressionType.flags & 1056 /* TypeFlags.EnumLike */) && !ts.isPrivateIdentifier(token) && !isSourceFileFromLibrary(program, enumDeclaration.getSourceFile())) {
                 return { kind: InfoKind.Enum, token: token, parentDeclaration: enumDeclaration };
             }
             return undefined;

package/lib/typescriptServices.js

@@ -99,7 +99,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220921");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220922");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -45243,6 +45243,7 @@ var ts;
         }
     }
     function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, nodeModulesDirectory, nodeModulesDirectoryExists, state, cache, redirectedReference) {
+        var _a;
         var candidate = ts.normalizePath(ts.combinePaths(nodeModulesDirectory, moduleName));
         // First look for a nested package.json, as in `node_modules/foo/bar/package.json`.
         var packageInfo = getPackageJsonInfo(candidate, !nodeModulesDirectoryExists, state);
@@ -45257,13 +45258,7 @@ var ts;
                 return withPackageId(packageInfo, fromDirectory);
             }
         }
-        var _a = parsePackageName(moduleName), packageName = _a.packageName, rest = _a.rest;
         var loader = function (extensions, candidate, onlyRecordFailures, state) {
-            var _a;
-            // package exports are higher priority than file/directory lookups (and, if there's exports present, blocks them)
-            if (packageInfo && packageInfo.contents.packageJsonContent.exports && state.features & NodeResolutionFeatures.Exports) {
-                return (_a = loadModuleFromExports(packageInfo, extensions, ts.combinePaths(".", rest), state, cache, redirectedReference)) === null || _a === void 0 ? void 0 : _a.value;
-            }
             var pathAndExtension = loadModuleFromFile(extensions, candidate, onlyRecordFailures, state) ||
                 loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageInfo && packageInfo.contents.packageJsonContent, packageInfo && packageInfo.contents.versionPaths);
             if (!pathAndExtension && packageInfo
@@ -45276,19 +45271,24 @@ var ts;
             }
             return withPackageId(packageInfo, pathAndExtension);
         };
-        if (rest !== "") { // If "rest" is empty, we just did this search above.
-            var packageDirectory = ts.combinePaths(nodeModulesDirectory, packageName);
-            // Don't use a "types" or "main" from here because we're not loading the root, but a subdirectory -- just here for the packageId and path mappings.
+        var _b = parsePackageName(moduleName), packageName = _b.packageName, rest = _b.rest;
+        var packageDirectory = ts.combinePaths(nodeModulesDirectory, packageName);
+        if (rest !== "") {
+            // Previous `packageInfo` may have been from a nested package.json; ensure we have the one from the package root now.
             packageInfo = getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state);
-            if (packageInfo && packageInfo.contents.versionPaths) {
-                if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, packageInfo.contents.versionPaths.version, ts.version, rest);
-                }
-                var packageDirectoryExists = nodeModulesDirectoryExists && ts.directoryProbablyExists(packageDirectory, state.host);
-                var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, packageInfo.contents.versionPaths.paths, /*pathPatterns*/ undefined, loader, !packageDirectoryExists, state);
-                if (fromPaths) {
-                    return fromPaths.value;
-                }
+        }
+        // package exports are higher priority than file/directory/typesVersions lookups and (and, if there's exports present, blocks them)
+        if (packageInfo && packageInfo.contents.packageJsonContent.exports && state.features & NodeResolutionFeatures.Exports) {
+            return (_a = loadModuleFromExports(packageInfo, extensions, ts.combinePaths(".", rest), state, cache, redirectedReference)) === null || _a === void 0 ? void 0 : _a.value;
+        }
+        if (rest !== "" && packageInfo && packageInfo.contents.versionPaths) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, packageInfo.contents.versionPaths.version, ts.version, rest);
+            }
+            var packageDirectoryExists = nodeModulesDirectoryExists && ts.directoryProbablyExists(packageDirectory, state.host);
+            var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, packageInfo.contents.versionPaths.paths, /*pathPatterns*/ undefined, loader, !packageDirectoryExists, state);
+            if (fromPaths) {
+                return fromPaths.value;
             }
         }
         return loader(extensions, candidate, !nodeModulesDirectoryExists, state);
@@ -55469,6 +55469,7 @@ var ts;
                         && symbol.escapedName !== "export=" /* InternalSymbolName.ExportEquals */
                         && !(symbol.flags & 4194304 /* SymbolFlags.Prototype */)
                         && !(symbol.flags & 32 /* SymbolFlags.Class */)
+                        && !(symbol.flags & 8192 /* SymbolFlags.Method */)
                         && !isConstMergedWithNSPrintableAsSignatureMerge) {
                         if (propertyAsAlias) {
                             var createdExport = serializeMaybeAliasAssignment(symbol);
@@ -115403,6 +115404,7 @@ var ts;
             writeTrailingSemicolon();
         }
         function emitExportDeclaration(node) {
+            emitModifiers(node, node.modifiers);
             var nextPos = emitTokenWithComment(93 /* SyntaxKind.ExportKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             if (node.isTypeOnly) {
@@ -146750,6 +146752,10 @@ var ts;
                         pushSelectionCommentRange(comment.pos, comment.end);
                     }
                     if (positionShouldSnapToNode(sourceFile, pos, node)) {
+                        if (ts.isFunctionBody(node)
+                            && ts.isFunctionLikeDeclaration(parentNode) && !ts.positionsAreOnSameLine(node.getStart(sourceFile), node.getEnd(), sourceFile)) {
+                            pushSelectionRange(node.getStart(sourceFile), node.getEnd());
+                        }
                         // 1. Blocks are effectively redundant with SyntaxLists.
                         // 2. TemplateSpans, along with the SyntaxLists containing them, are a somewhat unintuitive grouping
                         //    of things that should be considered independently.
@@ -158362,7 +158368,7 @@ var ts;
                 return { kind: InfoKind.TypeLikeDeclaration, token: token, call: call, modifierFlags: modifierFlags, parentDeclaration: declaration, declSourceFile: declSourceFile, isJSFile: isJSFile };
             }
             var enumDeclaration = ts.find(symbol.declarations, ts.isEnumDeclaration);
-            if (enumDeclaration && !ts.isPrivateIdentifier(token) && !isSourceFileFromLibrary(program, enumDeclaration.getSourceFile())) {
+            if (enumDeclaration && !(leftExpressionType.flags & 1056 /* TypeFlags.EnumLike */) && !ts.isPrivateIdentifier(token) && !isSourceFileFromLibrary(program, enumDeclaration.getSourceFile())) {
                 return { kind: InfoKind.Enum, token: token, parentDeclaration: enumDeclaration };
             }
             return undefined;

package/lib/typingsInstaller.js

@@ -89,7 +89,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220921");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220922");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -45233,6 +45233,7 @@ var ts;
         }
     }
     function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, nodeModulesDirectory, nodeModulesDirectoryExists, state, cache, redirectedReference) {
+        var _a;
         var candidate = ts.normalizePath(ts.combinePaths(nodeModulesDirectory, moduleName));
         // First look for a nested package.json, as in `node_modules/foo/bar/package.json`.
         var packageInfo = getPackageJsonInfo(candidate, !nodeModulesDirectoryExists, state);
@@ -45247,13 +45248,7 @@ var ts;
                 return withPackageId(packageInfo, fromDirectory);
             }
         }
-        var _a = parsePackageName(moduleName), packageName = _a.packageName, rest = _a.rest;
         var loader = function (extensions, candidate, onlyRecordFailures, state) {
-            var _a;
-            // package exports are higher priority than file/directory lookups (and, if there's exports present, blocks them)
-            if (packageInfo && packageInfo.contents.packageJsonContent.exports && state.features & NodeResolutionFeatures.Exports) {
-                return (_a = loadModuleFromExports(packageInfo, extensions, ts.combinePaths(".", rest), state, cache, redirectedReference)) === null || _a === void 0 ? void 0 : _a.value;
-            }
             var pathAndExtension = loadModuleFromFile(extensions, candidate, onlyRecordFailures, state) ||
                 loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageInfo && packageInfo.contents.packageJsonContent, packageInfo && packageInfo.contents.versionPaths);
             if (!pathAndExtension && packageInfo
@@ -45266,19 +45261,24 @@ var ts;
             }
             return withPackageId(packageInfo, pathAndExtension);
         };
-        if (rest !== "") { // If "rest" is empty, we just did this search above.
-            var packageDirectory = ts.combinePaths(nodeModulesDirectory, packageName);
-            // Don't use a "types" or "main" from here because we're not loading the root, but a subdirectory -- just here for the packageId and path mappings.
+        var _b = parsePackageName(moduleName), packageName = _b.packageName, rest = _b.rest;
+        var packageDirectory = ts.combinePaths(nodeModulesDirectory, packageName);
+        if (rest !== "") {
+            // Previous `packageInfo` may have been from a nested package.json; ensure we have the one from the package root now.
             packageInfo = getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state);
-            if (packageInfo && packageInfo.contents.versionPaths) {
-                if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, packageInfo.contents.versionPaths.version, ts.version, rest);
-                }
-                var packageDirectoryExists = nodeModulesDirectoryExists && ts.directoryProbablyExists(packageDirectory, state.host);
-                var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, packageInfo.contents.versionPaths.paths, /*pathPatterns*/ undefined, loader, !packageDirectoryExists, state);
-                if (fromPaths) {
-                    return fromPaths.value;
-                }
+        }
+        // package exports are higher priority than file/directory/typesVersions lookups and (and, if there's exports present, blocks them)
+        if (packageInfo && packageInfo.contents.packageJsonContent.exports && state.features & NodeResolutionFeatures.Exports) {
+            return (_a = loadModuleFromExports(packageInfo, extensions, ts.combinePaths(".", rest), state, cache, redirectedReference)) === null || _a === void 0 ? void 0 : _a.value;
+        }
+        if (rest !== "" && packageInfo && packageInfo.contents.versionPaths) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, packageInfo.contents.versionPaths.version, ts.version, rest);
+            }
+            var packageDirectoryExists = nodeModulesDirectoryExists && ts.directoryProbablyExists(packageDirectory, state.host);
+            var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, packageInfo.contents.versionPaths.paths, /*pathPatterns*/ undefined, loader, !packageDirectoryExists, state);
+            if (fromPaths) {
+                return fromPaths.value;
             }
         }
         return loader(extensions, candidate, !nodeModulesDirectoryExists, state);
@@ -55459,6 +55459,7 @@ var ts;
                         && symbol.escapedName !== "export=" /* InternalSymbolName.ExportEquals */
                         && !(symbol.flags & 4194304 /* SymbolFlags.Prototype */)
                         && !(symbol.flags & 32 /* SymbolFlags.Class */)
+                        && !(symbol.flags & 8192 /* SymbolFlags.Method */)
                         && !isConstMergedWithNSPrintableAsSignatureMerge) {
                         if (propertyAsAlias) {
                             var createdExport = serializeMaybeAliasAssignment(symbol);
@@ -115393,6 +115394,7 @@ var ts;
             writeTrailingSemicolon();
         }
         function emitExportDeclaration(node) {
+            emitModifiers(node, node.modifiers);
             var nextPos = emitTokenWithComment(93 /* SyntaxKind.ExportKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             if (node.isTypeOnly) {

package/lib/zh-tw/diagnosticMessages.generated.json

@@ -1427,7 +1427,6 @@
   "The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type_2362": "算術運算的左側內容必須屬於 'any'、'number'、'bigint' 或列舉類型。",
   "The_left_hand_side_of_an_assignment_expression_may_not_be_an_optional_property_access_2779": "指派運算式的左側不可為選擇性屬性存取。",
   "The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access_2364": "指派運算式的左邊必須是變數或屬性存取。",
-  "The_left_hand_side_of_an_in_expression_must_be_a_private_identifier_or_of_type_any_string_number_or__2360": "'in' 運算式的左側必須是私人識別碼或 'any'、'string'、'number' 或 'symbol' 類型。",
   "The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_paramete_2358": "'instanceof' 運算式左側必須是類型 'any'、物件類型或型別參數。",
   "The_locale_used_when_displaying_messages_to_the_user_e_g_en_us_6156": "對使用者顯示訊息時所使用的地區設定 (例如 'zh-tw')",
   "The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files_6136": "在 node_modules 及載入 JavaScript 檔案下搜尋時的最大相依性深度。",
@@ -1448,7 +1447,6 @@
   "The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_Did_you_mean_to_wri_1064": "非同步函式或方法的傳回型別，必須為全域 Promise<T> 類型。是否要寫入 'Promise<{0}>'?",
   "The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter_but_2407": "'for...in' 陳述式的右方必須是類型 'any'、物件類型或型別參數，但此處為類型 '{0}'。",
   "The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type_2363": "算術運算的右側內容必須屬於 'any'、'number'、'bigint' 或列舉類型。",
-  "The_right_hand_side_of_an_in_expression_must_not_be_a_primitive_2361": "'In' 運算式的右側不得為基元。",
   "The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_F_2359": "'instanceof' 運算式的右側必須是 'any' 類型，或是可指派給 'Function' 介面類型的類型。",
   "The_root_value_of_a_0_file_must_be_an_object_5092": "'{0}' 檔案的根值必須是物件。",
   "The_shadowing_declaration_of_0_is_defined_here_18017": "'{0}' 的隱蔽宣告定義於此處",
@@ -1551,6 +1549,7 @@
   "Type_0_is_not_assignable_to_type_1_with_exactOptionalPropertyTypes_Colon_true_Consider_adding_undefi_2412": "類型 '{0}' 無法指派給類型為具有 'exactOptionalPropertyTypes: true' 的類型 '{1}'。請考慮將 'undefined' 新增到目標的類型。",
   "Type_0_is_not_comparable_to_type_1_2678": "類型 '{0}' 無法和類型 '{1}' 比較。",
   "Type_0_is_not_generic_2315": "'{0}' 不是泛型類型。",
+  "Type_0_may_represent_a_primitive_value_which_is_not_permitted_as_the_right_operand_of_the_in_operato_2638": "類型 '{0}' 可能代表基本值，但不允許做為 'in' 運算子的右運算元。",
   "Type_0_must_have_a_Symbol_asyncIterator_method_that_returns_an_async_iterator_2504": "類型 '{0}' 必須具備會傳回非同步迭代器的 '[Symbol.asyncIterator]()' 方法。",
   "Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator_2488": "類型 '{0}' 必須具備會傳回迭代器的 '[Symbol.iterator]()' 方法。",
   "Type_0_provides_no_match_for_the_signature_1_2658": "類型 '{0}' 沒有符合特徵標記 '{1}' 的項目。",

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "4.9.0-dev.20220921",
+    "version": "4.9.0-dev.20220922",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [