@typescript-deploys/pr-build 5.7.0-pr-56941-53 → 5.7.0-pr-57718-9

package/lib/_tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.7";
-var version = `${versionMajorMinor}.0-insiders.20241007`;
+var version = `${versionMajorMinor}.0-insiders.20241031`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -3680,7 +3680,6 @@ var ObjectFlags = /* @__PURE__ */ ((ObjectFlags3) => {
   ObjectFlags3[ObjectFlags3["IsGenericObjectType"] = 4194304] = "IsGenericObjectType";
   ObjectFlags3[ObjectFlags3["IsGenericIndexType"] = 8388608] = "IsGenericIndexType";
   ObjectFlags3[ObjectFlags3["IsGenericType"] = 12582912] = "IsGenericType";
-  ObjectFlags3[ObjectFlags3["IsNarrowedType"] = 16777216] = "IsNarrowedType";
   ObjectFlags3[ObjectFlags3["ContainsIntersections"] = 16777216] = "ContainsIntersections";
   ObjectFlags3[ObjectFlags3["IsUnknownLikeUnionComputed"] = 33554432] = "IsUnknownLikeUnionComputed";
   ObjectFlags3[ObjectFlags3["IsUnknownLikeUnion"] = 67108864] = "IsUnknownLikeUnion";
@@ -15158,12 +15157,12 @@ function canHaveFlowNode(node) {
     case 80 /* Identifier */:
     case 110 /* ThisKeyword */:
     case 108 /* SuperKeyword */:
-    case 212 /* ElementAccessExpression */:
-    case 211 /* PropertyAccessExpression */:
-    case 218 /* FunctionExpression */:
     case 166 /* QualifiedName */:
     case 236 /* MetaProperty */:
+    case 212 /* ElementAccessExpression */:
+    case 211 /* PropertyAccessExpression */:
     case 208 /* BindingElement */:
+    case 218 /* FunctionExpression */:
     case 219 /* ArrowFunction */:
     case 174 /* MethodDeclaration */:
     case 177 /* GetAccessor */:
@@ -16086,7 +16085,7 @@ function hasInvalidEscape(template) {
 }
 var doubleQuoteEscapedCharsRegExp = /[\\"\u0000-\u001f\u2028\u2029\u0085]/g;
 var singleQuoteEscapedCharsRegExp = /[\\'\u0000-\u001f\u2028\u2029\u0085]/g;
-var backtickQuoteEscapedCharsRegExp = /\r\n|[\\`\u0000-\u001f\u2028\u2029\u0085]/g;
+var backtickQuoteEscapedCharsRegExp = /\r\n|[\\`\u0000-\u0009\u000b-\u001f\u2028\u2029\u0085]/g;
 var escapedCharsMap = new Map(Object.entries({
   "	": "\\t",
   "\v": "\\v",
@@ -17377,6 +17376,13 @@ function getLastChild(node) {
   });
   return lastChild;
 }
+function addToSeen(seen, key) {
+  if (seen.has(key)) {
+    return false;
+  }
+  seen.add(key);
+  return true;
+}
 function isTypeNodeKind(kind) {
   return kind >= 182 /* FirstTypeNode */ && kind <= 205 /* LastTypeNode */ || kind === 133 /* AnyKeyword */ || kind === 159 /* UnknownKeyword */ || kind === 150 /* NumberKeyword */ || kind === 163 /* BigIntKeyword */ || kind === 151 /* ObjectKeyword */ || kind === 136 /* BooleanKeyword */ || kind === 154 /* StringKeyword */ || kind === 155 /* SymbolKeyword */ || kind === 116 /* VoidKeyword */ || kind === 157 /* UndefinedKeyword */ || kind === 146 /* NeverKeyword */ || kind === 141 /* IntrinsicKeyword */ || kind === 233 /* ExpressionWithTypeArguments */ || kind === 312 /* JSDocAllType */ || kind === 313 /* JSDocUnknownType */ || kind === 314 /* JSDocNullableType */ || kind === 315 /* JSDocNonNullableType */ || kind === 316 /* JSDocOptionalType */ || kind === 317 /* JSDocFunctionType */ || kind === 318 /* JSDocVariadicType */;
 }
@@ -26006,13 +26012,23 @@ var importStarHelper = {
   dependencies: [createBindingHelper, setModuleDefaultHelper],
   priority: 2,
   text: `
-            var __importStar = (this && this.__importStar) || function (mod) {
-                if (mod && mod.__esModule) return mod;
-                var result = {};
-                if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-                __setModuleDefault(result, mod);
-                return result;
-            };`
+            var __importStar = (this && this.__importStar) || (function () {
+                var ownKeys = function(o) {
+                    ownKeys = Object.getOwnPropertyNames || function (o) {
+                        var ar = [];
+                        for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+                        return ar;
+                    };
+                    return ownKeys(o);
+                };
+                return function (mod) {
+                    if (mod && mod.__esModule) return mod;
+                    var result = {};
+                    if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+                    __setModuleDefault(result, mod);
+                    return result;
+                };
+            })();`
 };
 var importDefaultHelper = {
   name: "typescript:commonjsimportdefault",
@@ -29532,10 +29548,12 @@ var Parser;
       case 90 /* DefaultKeyword */:
         return nextTokenCanFollowDefaultKeyword();
       case 126 /* StaticKeyword */:
+        nextToken();
+        return canFollowModifier();
       case 139 /* GetKeyword */:
       case 153 /* SetKeyword */:
         nextToken();
-        return canFollowModifier();
+        return canFollowGetOrSetKeyword();
       default:
         return nextTokenIsOnSameLineAndCanFollowModifier();
     }
@@ -29553,6 +29571,9 @@ var Parser;
   function canFollowModifier() {
     return token() === 23 /* OpenBracketToken */ || token() === 19 /* OpenBraceToken */ || token() === 42 /* AsteriskToken */ || token() === 26 /* DotDotDotToken */ || isLiteralPropertyName();
   }
+  function canFollowGetOrSetKeyword() {
+    return token() === 23 /* OpenBracketToken */ || isLiteralPropertyName();
+  }
   function nextTokenCanFollowDefaultKeyword() {
     nextToken();
     return token() === 86 /* ClassKeyword */ || token() === 100 /* FunctionKeyword */ || token() === 120 /* InterfaceKeyword */ || token() === 60 /* AtToken */ || token() === 128 /* AbstractKeyword */ && lookAhead(nextTokenIsClassKeywordOnSameLine) || token() === 134 /* AsyncKeyword */ && lookAhead(nextTokenIsFunctionKeywordOnSameLine);
@@ -38163,7 +38184,7 @@ function convertToTSConfig(configParseResult, configFileName, host) {
   const providedKeys = new Set(optionMap.keys());
   const impliedCompilerOptions = {};
   for (const option in computedOptions) {
-    if (!providedKeys.has(option) && some(computedOptions[option].dependencies, (dep) => providedKeys.has(dep))) {
+    if (!providedKeys.has(option) && optionDependsOn(option, providedKeys)) {
       const implied = computedOptions[option].computeValue(configParseResult.options);
       const defaultValue = computedOptions[option].computeValue({});
       if (implied !== defaultValue) {
@@ -38174,6 +38195,17 @@ function convertToTSConfig(configParseResult, configFileName, host) {
   assign(config.compilerOptions, optionMapToObject(serializeCompilerOptions(impliedCompilerOptions, pathOptions)));
   return config;
 }
+function optionDependsOn(option, dependsOn) {
+  const seen = /* @__PURE__ */ new Set();
+  return optionDependsOnRecursive(option);
+  function optionDependsOnRecursive(option2) {
+    var _a;
+    if (addToSeen(seen, option2)) {
+      return some((_a = computedOptions[option2]) == null ? void 0 : _a.dependencies, (dep) => dependsOn.has(dep) || optionDependsOnRecursive(dep));
+    }
+    return false;
+  }
+}
 function optionMapToObject(optionMap) {
   return Object.fromEntries(optionMap);
 }
@@ -40474,25 +40506,28 @@ function nodeModuleNameResolverWorker(features, moduleName, containingDirectory,
       return toSearchResult({ resolved, isExternalLibraryImport: pathContainsNodeModules(resolved.path) });
     }
     if (!isExternalModuleNameRelative(moduleName)) {
-      let resolved2;
       if (features & 2 /* Imports */ && startsWith(moduleName, "#")) {
-        resolved2 = loadModuleFromImports(extensions2, moduleName, containingDirectory, state2, cache, redirectedReference);
-      }
-      if (!resolved2 && features & 4 /* SelfName */) {
-        resolved2 = loadModuleFromSelfNameReference(extensions2, moduleName, containingDirectory, state2, cache, redirectedReference);
+        const resolved3 = loadModuleFromImports(extensions2, moduleName, containingDirectory, state2, cache, redirectedReference);
+        if (resolved3) {
+          return resolved3.value && { value: { resolved: resolved3.value, isExternalLibraryImport: false } };
+        }
       }
-      if (!resolved2) {
-        if (moduleName.includes(":")) {
-          if (traceEnabled) {
-            trace(host, Diagnostics.Skipping_module_0_that_looks_like_an_absolute_URI_target_file_types_Colon_1, moduleName, formatExtensions(extensions2));
-          }
-          return void 0;
+      if (features & 4 /* SelfName */) {
+        const resolved3 = loadModuleFromSelfNameReference(extensions2, moduleName, containingDirectory, state2, cache, redirectedReference);
+        if (resolved3) {
+          return resolved3.value && { value: { resolved: resolved3.value, isExternalLibraryImport: false } };
         }
+      }
+      if (moduleName.includes(":")) {
         if (traceEnabled) {
-          trace(host, Diagnostics.Loading_module_0_from_node_modules_folder_target_file_types_Colon_1, moduleName, formatExtensions(extensions2));
+          trace(host, Diagnostics.Skipping_module_0_that_looks_like_an_absolute_URI_target_file_types_Colon_1, moduleName, formatExtensions(extensions2));
         }
-        resolved2 = loadModuleFromNearestNodeModulesDirectory(extensions2, moduleName, containingDirectory, state2, cache, redirectedReference);
+        return void 0;
       }
+      if (traceEnabled) {
+        trace(host, Diagnostics.Loading_module_0_from_node_modules_folder_target_file_types_Colon_1, moduleName, formatExtensions(extensions2));
+      }
+      let resolved2 = loadModuleFromNearestNodeModulesDirectory(extensions2, moduleName, containingDirectory, state2, cache, redirectedReference);
       if (extensions2 & 4 /* Declaration */) {
         resolved2 ?? (resolved2 = resolveFromTypeRoot(moduleName, state2));
       }
@@ -40920,7 +40955,7 @@ function loadModuleFromExports(scope, extensions, subpath, state, cache, redirec
       mainExport = scope.contents.packageJsonContent.exports["."];
     }
     if (mainExport) {
-      const loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(
+      const loadModuleFromTargetExportOrImport = getLoadModuleFromTargetExportOrImport(
         extensions,
         state,
         cache,
@@ -40930,7 +40965,7 @@ function loadModuleFromExports(scope, extensions, subpath, state, cache, redirec
         /*isImports*/
         false
       );
-      return loadModuleFromTargetImportOrExport(
+      return loadModuleFromTargetExportOrImport(
         mainExport,
         "",
         /*pattern*/
@@ -40948,7 +40983,7 @@ function loadModuleFromExports(scope, extensions, subpath, state, cache, redirec
         void 0
       );
     }
-    const result = loadModuleFromImportsOrExports(
+    const result = loadModuleFromExportsOrImports(
       extensions,
       state,
       cache,
@@ -41002,7 +41037,7 @@ function loadModuleFromImports(extensions, moduleName, directory, state, cache,
       void 0
     );
   }
-  const result = loadModuleFromImportsOrExports(
+  const result = loadModuleFromExportsOrImports(
     extensions,
     state,
     cache,
@@ -41037,11 +41072,11 @@ function comparePatternKeys(a, b) {
   if (b.length > a.length) return 1 /* GreaterThan */;
   return 0 /* EqualTo */;
 }
-function loadModuleFromImportsOrExports(extensions, state, cache, redirectedReference, moduleName, lookupTable, scope, isImports) {
-  const loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, moduleName, scope, isImports);
+function loadModuleFromExportsOrImports(extensions, state, cache, redirectedReference, moduleName, lookupTable, scope, isImports) {
+  const loadModuleFromTargetExportOrImport = getLoadModuleFromTargetExportOrImport(extensions, state, cache, redirectedReference, moduleName, scope, isImports);
   if (!endsWith(moduleName, directorySeparator) && !moduleName.includes("*") && hasProperty(lookupTable, moduleName)) {
     const target = lookupTable[moduleName];
-    return loadModuleFromTargetImportOrExport(
+    return loadModuleFromTargetExportOrImport(
       target,
       /*subpath*/
       "",
@@ -41056,7 +41091,7 @@ function loadModuleFromImportsOrExports(extensions, state, cache, redirectedRefe
       const target = lookupTable[potentialTarget];
       const starPos = potentialTarget.indexOf("*");
       const subpath = moduleName.substring(potentialTarget.substring(0, starPos).length, moduleName.length - (potentialTarget.length - 1 - starPos));
-      return loadModuleFromTargetImportOrExport(
+      return loadModuleFromTargetExportOrImport(
         target,
         subpath,
         /*pattern*/
@@ -41066,7 +41101,7 @@ function loadModuleFromImportsOrExports(extensions, state, cache, redirectedRefe
     } else if (endsWith(potentialTarget, "*") && startsWith(moduleName, potentialTarget.substring(0, potentialTarget.length - 1))) {
       const target = lookupTable[potentialTarget];
       const subpath = moduleName.substring(potentialTarget.length - 1);
-      return loadModuleFromTargetImportOrExport(
+      return loadModuleFromTargetExportOrImport(
         target,
         subpath,
         /*pattern*/
@@ -41076,7 +41111,7 @@ function loadModuleFromImportsOrExports(extensions, state, cache, redirectedRefe
     } else if (startsWith(moduleName, potentialTarget)) {
       const target = lookupTable[potentialTarget];
       const subpath = moduleName.substring(potentialTarget.length);
-      return loadModuleFromTargetImportOrExport(
+      return loadModuleFromTargetExportOrImport(
         target,
         subpath,
         /*pattern*/
@@ -41096,9 +41131,9 @@ function hasOneAsterisk(patternKey) {
   const firstStar = patternKey.indexOf("*");
   return firstStar !== -1 && firstStar === patternKey.lastIndexOf("*");
 }
-function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, moduleName, scope, isImports) {
-  return loadModuleFromTargetImportOrExport;
-  function loadModuleFromTargetImportOrExport(target, subpath, pattern, key) {
+function getLoadModuleFromTargetExportOrImport(extensions, state, cache, redirectedReference, moduleName, scope, isImports) {
+  return loadModuleFromTargetExportOrImport;
+  function loadModuleFromTargetExportOrImport(target, subpath, pattern, key) {
     if (typeof target === "string") {
       if (!pattern && subpath.length > 0 && !endsWith(target, "/")) {
         if (state.traceEnabled) {
@@ -41188,7 +41223,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
           if (condition === "default" || state.conditions.includes(condition) || isApplicableVersionedTypesKey(state.conditions, condition)) {
             traceIfEnabled(state, Diagnostics.Matched_0_condition_1, isImports ? "imports" : "exports", condition);
             const subTarget = target[condition];
-            const result = loadModuleFromTargetImportOrExport(subTarget, subpath, pattern, key);
+            const result = loadModuleFromTargetExportOrImport(subTarget, subpath, pattern, key);
             if (result) {
               traceIfEnabled(state, Diagnostics.Resolved_under_condition_0, condition);
               traceIfEnabled(state, Diagnostics.Exiting_conditional_exports);
@@ -41213,7 +41248,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
           );
         }
         for (const elem of target) {
-          const result = loadModuleFromTargetImportOrExport(elem, subpath, pattern, key);
+          const result = loadModuleFromTargetExportOrImport(elem, subpath, pattern, key);
           if (result) {
             return result;
           }
@@ -41873,7 +41908,6 @@ function createBinder() {
   var preSwitchCaseFlow;
   var activeLabelList;
   var hasExplicitReturn;
-  var inReturnStatement;
   var hasFlowEffects;
   var emitFlags;
   var inStrictMode;
@@ -41946,7 +41980,6 @@ function createBinder() {
     currentExceptionTarget = void 0;
     activeLabelList = void 0;
     hasExplicitReturn = false;
-    inReturnStatement = false;
     hasFlowEffects = false;
     inAssignmentPattern = false;
     emitFlags = 0 /* None */;
@@ -42711,10 +42744,7 @@ function createBinder() {
     currentFlow = finishFlowLabel(postIfLabel);
   }
   function bindReturnOrThrow(node) {
-    const oldInReturnStatement = inReturnStatement;
-    inReturnStatement = true;
     bind(node.expression);
-    inReturnStatement = oldInReturnStatement;
     if (node.kind === 253 /* ReturnStatement */) {
       hasExplicitReturn = true;
       if (currentReturnTarget) {
@@ -43075,16 +43105,10 @@ function createBinder() {
     hasFlowEffects = false;
     bindCondition(node.condition, trueLabel, falseLabel);
     currentFlow = finishFlowLabel(trueLabel);
-    if (inReturnStatement) {
-      node.flowNodeWhenTrue = currentFlow;
-    }
     bind(node.questionToken);
     bind(node.whenTrue);
     addAntecedent(postExpressionLabel, currentFlow);
     currentFlow = finishFlowLabel(falseLabel);
-    if (inReturnStatement) {
-      node.flowNodeWhenFalse = currentFlow;
-    }
     bind(node.colonToken);
     bind(node.whenFalse);
     addAntecedent(postExpressionLabel, currentFlow);
@@ -45017,31 +45041,29 @@ function computeModuleSpecifiers(modulePaths, compilerOptions, importingSourceFi
         return { kind: "node_modules", moduleSpecifiers: nodeModulesSpecifiers, computedWithoutCache: true };
       }
     }
-    if (!specifier) {
-      const local = getLocalModuleSpecifier(
-        modulePath.path,
-        info,
-        compilerOptions,
-        host,
-        options.overrideImportMode || importingSourceFile.impliedNodeFormat,
-        preferences,
-        /*pathsOnly*/
-        modulePath.isRedirect
-      );
-      if (!local || forAutoImport && isExcludedByRegex(local, preferences.excludeRegexes)) {
-        continue;
-      }
-      if (modulePath.isRedirect) {
-        redirectPathsSpecifiers = append(redirectPathsSpecifiers, local);
-      } else if (pathIsBareSpecifier(local)) {
-        if (pathContainsNodeModules(local)) {
-          relativeSpecifiers = append(relativeSpecifiers, local);
-        } else {
-          pathsSpecifiers = append(pathsSpecifiers, local);
-        }
-      } else if (forAutoImport || !importedFileIsInNodeModules || modulePath.isInNodeModules) {
+    const local = getLocalModuleSpecifier(
+      modulePath.path,
+      info,
+      compilerOptions,
+      host,
+      options.overrideImportMode || importingSourceFile.impliedNodeFormat,
+      preferences,
+      /*pathsOnly*/
+      modulePath.isRedirect || !!specifier
+    );
+    if (!local || forAutoImport && isExcludedByRegex(local, preferences.excludeRegexes)) {
+      continue;
+    }
+    if (modulePath.isRedirect) {
+      redirectPathsSpecifiers = append(redirectPathsSpecifiers, local);
+    } else if (pathIsBareSpecifier(local)) {
+      if (pathContainsNodeModules(local)) {
         relativeSpecifiers = append(relativeSpecifiers, local);
+      } else {
+        pathsSpecifiers = append(pathsSpecifiers, local);
       }
+    } else if (forAutoImport || !importedFileIsInNodeModules || modulePath.isInNodeModules) {
+      relativeSpecifiers = append(relativeSpecifiers, local);
     }
   }
   return (pathsSpecifiers == null ? void 0 : pathsSpecifiers.length) ? { kind: "paths", moduleSpecifiers: pathsSpecifiers, computedWithoutCache: true } : (redirectPathsSpecifiers == null ? void 0 : redirectPathsSpecifiers.length) ? { kind: "redirect", moduleSpecifiers: redirectPathsSpecifiers, computedWithoutCache: true } : (nodeModulesSpecifiers == null ? void 0 : nodeModulesSpecifiers.length) ? { kind: "node_modules", moduleSpecifiers: nodeModulesSpecifiers, computedWithoutCache: true } : { kind: "relative", moduleSpecifiers: relativeSpecifiers ?? emptyArray, computedWithoutCache: true };
@@ -45087,7 +45109,7 @@ function getLocalModuleSpecifier(moduleFileName, info, compilerOptions, host, im
     importMode,
     prefersTsExtension(allowedEndings)
   );
-  const fromPaths = pathsOnly || fromPackageJsonImports === void 0 ? paths && tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, host, compilerOptions) : void 0;
+  const fromPaths = pathsOnly || fromPackageJsonImports === void 0 ? paths && tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, baseDirectory, getCanonicalFileName, host, compilerOptions) : void 0;
   if (pathsOnly) {
     return fromPaths;
   }
@@ -45301,10 +45323,11 @@ function tryGetModuleNameFromAmbientModule(moduleSymbol, checker) {
     return ambientModuleDeclare.name.text;
   }
 }
-function tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, host, compilerOptions) {
+function tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, baseDirectory, getCanonicalFileName, host, compilerOptions) {
   for (const key in paths) {
     for (const patternText2 of paths[key]) {
-      const pattern = normalizePath(patternText2);
+      const normalized = normalizePath(patternText2);
+      const pattern = getRelativePathIfInSameVolume(normalized, baseDirectory, getCanonicalFileName) ?? normalized;
       const indexOfStar = pattern.indexOf("*");
       const candidates = allowedEndings.map((ending) => ({
         ending,
@@ -45633,6 +45656,8 @@ function tryGetModuleNameAsNodeModule({ path, isRedirect }, { getCanonicalFileNa
           subModuleName,
           versionPaths.paths,
           allowedEndings,
+          packageRootPath,
+          getCanonicalFileName,
           host,
           options
         );
@@ -46927,7 +46952,6 @@ function createTypeChecker(host) {
     [".jsx", ".jsx"],
     [".json", ".json"]
   ];
-  var narrowableReturnTypeCache = /* @__PURE__ */ new Map();
   initializeTypeChecker();
   return checker;
   function isDefinitelyReferenceToGlobalSymbolObject(node) {
@@ -50291,6 +50315,9 @@ function createTypeChecker(host) {
           }
         }
         let annotationType = getTypeFromTypeNodeWithoutContext(existing);
+        if (isErrorType(annotationType)) {
+          return true;
+        }
         if (requiresAddingUndefined && annotationType) {
           annotationType = getOptionalType(annotationType, !isParameter(node));
         }
@@ -51317,7 +51344,7 @@ function createTypeChecker(host) {
         const signatures = getSignaturesOfType(filterType(propertyType, (t) => !(t.flags & 32768 /* Undefined */)), 0 /* Call */);
         for (const signature of signatures) {
           const methodDeclaration = signatureToSignatureDeclarationHelper(signature, 173 /* MethodSignature */, context, { name: propertyName, questionToken: optionalToken });
-          typeElements.push(preserveCommentsOn(methodDeclaration));
+          typeElements.push(preserveCommentsOn(methodDeclaration, signature.declaration || propertySymbol.valueDeclaration));
         }
         if (signatures.length || !optionalToken) {
           return;
@@ -51352,8 +51379,8 @@ function createTypeChecker(host) {
         optionalToken,
         propertyTypeNode
       );
-      typeElements.push(preserveCommentsOn(propertySignature));
-      function preserveCommentsOn(node) {
+      typeElements.push(preserveCommentsOn(propertySignature, propertySymbol.valueDeclaration));
+      function preserveCommentsOn(node, range) {
         var _a2;
         const jsdocPropertyTag = (_a2 = propertySymbol.declarations) == null ? void 0 : _a2.find((d) => d.kind === 348 /* JSDocPropertyTag */);
         if (jsdocPropertyTag) {
@@ -51361,8 +51388,8 @@ function createTypeChecker(host) {
           if (commentText) {
             setSyntheticLeadingComments(node, [{ kind: 3 /* MultiLineCommentTrivia */, text: "*\n * " + commentText.replace(/\n/g, "\n * ") + "\n ", pos: -1, end: -1, hasTrailingNewLine: true }]);
           }
-        } else if (propertySymbol.valueDeclaration) {
-          setCommentRange2(context, node, propertySymbol.valueDeclaration);
+        } else if (range) {
+          setCommentRange2(context, node, range);
         }
         return node;
       }
@@ -55474,7 +55501,7 @@ function createTypeChecker(host) {
       const getter = getDeclarationOfKind(symbol, 177 /* GetAccessor */);
       const setter = getDeclarationOfKind(symbol, 178 /* SetAccessor */);
       const accessor = tryCast(getDeclarationOfKind(symbol, 172 /* PropertyDeclaration */), isAutoAccessorPropertyDeclaration);
-      let type = getter && isInJSFile(getter) && getTypeForDeclarationFromJSDocComment(getter) || getAnnotatedAccessorType(getter) || getAnnotatedAccessorType(setter) || getAnnotatedAccessorType(accessor) || getter && getter.body && getReturnTypeFromBody(getter) || accessor && accessor.initializer && getWidenedTypeForVariableLikeDeclaration(
+      let type = getter && isInJSFile(getter) && getTypeForDeclarationFromJSDocComment(getter) || getAnnotatedAccessorType(getter) || getAnnotatedAccessorType(setter) || getAnnotatedAccessorType(accessor) || getter && getter.body && getReturnTypeFromBody(getter) || accessor && getWidenedTypeForVariableLikeDeclaration(
         accessor,
         /*reportErrors*/
         true
@@ -59157,14 +59184,11 @@ function createTypeChecker(host) {
   function isNoInferType(type) {
     return !!(type.flags & 33554432 /* Substitution */ && type.constraint.flags & 2 /* Unknown */);
   }
-  function isNarrowingSubstitutionType(type) {
-    return !!(type.flags & 33554432 /* Substitution */ && type.objectFlags & 16777216 /* IsNarrowedType */);
+  function getSubstitutionType(baseType, constraint) {
+    return constraint.flags & 3 /* AnyOrUnknown */ || constraint === baseType || baseType.flags & 1 /* Any */ ? baseType : getOrCreateSubstitutionType(baseType, constraint);
   }
-  function getSubstitutionType(baseType, constraint, isNarrowed) {
-    return constraint.flags & 3 /* AnyOrUnknown */ || constraint === baseType || baseType.flags & 1 /* Any */ ? baseType : getOrCreateSubstitutionType(baseType, constraint, isNarrowed);
-  }
-  function getOrCreateSubstitutionType(baseType, constraint, isNarrowed) {
-    const id = `${getTypeId(baseType)}>${getTypeId(constraint)}${isNarrowed ? ">N" : ""}`;
+  function getOrCreateSubstitutionType(baseType, constraint) {
+    const id = `${getTypeId(baseType)}>${getTypeId(constraint)}`;
     const cached = substitutionTypes.get(id);
     if (cached) {
       return cached;
@@ -59172,9 +59196,6 @@ function createTypeChecker(host) {
     const result = createType(33554432 /* Substitution */);
     result.baseType = baseType;
     result.constraint = constraint;
-    if (isNarrowed) {
-      result.objectFlags |= 16777216 /* IsNarrowedType */;
-    }
     substitutionTypes.set(id, result);
     return result;
   }
@@ -61377,7 +61398,7 @@ function createTypeChecker(host) {
   function isDeferredType(type, checkTuples) {
     return isGenericType(type) || checkTuples && isTupleType(type) && some(getElementTypes(type), isGenericType);
   }
-  function getConditionalType(root, mapper, forConstraint, aliasSymbol, aliasTypeArguments, forNarrowing) {
+  function getConditionalType(root, mapper, forConstraint, aliasSymbol, aliasTypeArguments) {
     let result;
     let extraTypes;
     let tailCount = 0;
@@ -61394,11 +61415,10 @@ function createTypeChecker(host) {
       if (checkType === wildcardType || extendsType === wildcardType) {
         return wildcardType;
       }
-      const effectiveCheckType = forNarrowing && isNarrowingSubstitutionType(checkType) ? checkType.constraint : checkType;
       const checkTypeNode = skipTypeParentheses(root.node.checkType);
       const extendsTypeNode = skipTypeParentheses(root.node.extendsType);
       const checkTuples = isSimpleTupleType(checkTypeNode) && isSimpleTupleType(extendsTypeNode) && length(checkTypeNode.elements) === length(extendsTypeNode.elements);
-      const checkTypeDeferred = isDeferredType(effectiveCheckType, checkTuples);
+      const checkTypeDeferred = isDeferredType(checkType, checkTuples);
       let combinedMapper;
       if (root.inferTypeParameters) {
         const context = createInferenceContext(
@@ -61417,8 +61437,8 @@ function createTypeChecker(host) {
       }
       const inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
       if (!checkTypeDeferred && !isDeferredType(inferredExtendsType, checkTuples)) {
-        if (!(inferredExtendsType.flags & 3 /* AnyOrUnknown */) && (effectiveCheckType.flags & 1 /* Any */ || !isTypeAssignableTo(getPermissiveInstantiation(effectiveCheckType), getPermissiveInstantiation(inferredExtendsType)))) {
-          if (effectiveCheckType.flags & 1 /* Any */ || forConstraint && !(inferredExtendsType.flags & 131072 /* Never */) && someType(getPermissiveInstantiation(inferredExtendsType), (t) => isTypeAssignableTo(t, getPermissiveInstantiation(effectiveCheckType)))) {
+        if (!(inferredExtendsType.flags & 3 /* AnyOrUnknown */) && (checkType.flags & 1 /* Any */ || !isTypeAssignableTo(getPermissiveInstantiation(checkType), getPermissiveInstantiation(inferredExtendsType)))) {
+          if (checkType.flags & 1 /* Any */ || forConstraint && !(inferredExtendsType.flags & 131072 /* Never */) && someType(getPermissiveInstantiation(inferredExtendsType), (t) => isTypeAssignableTo(t, getPermissiveInstantiation(checkType)))) {
             (extraTypes || (extraTypes = [])).push(instantiateType(getTypeFromTypeNode(root.node.trueType), combinedMapper || mapper));
           }
           const falseType2 = getTypeFromTypeNode(root.node.falseType);
@@ -61435,7 +61455,7 @@ function createTypeChecker(host) {
           result = instantiateType(falseType2, mapper);
           break;
         }
-        if (inferredExtendsType.flags & 3 /* AnyOrUnknown */ || isTypeAssignableTo(getRestrictiveInstantiation(effectiveCheckType), getRestrictiveInstantiation(inferredExtendsType))) {
+        if (inferredExtendsType.flags & 3 /* AnyOrUnknown */ || isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(inferredExtendsType))) {
           const trueType2 = getTypeFromTypeNode(root.node.trueType);
           const trueMapper = combinedMapper || mapper;
           if (canTailRecurse(trueType2, trueMapper)) {
@@ -61626,7 +61646,7 @@ function createTypeChecker(host) {
     const links = getNodeLinks(node);
     if (!links.resolvedType) {
       const aliasSymbol = getAliasSymbolForTypeNode(node);
-      if (getMembersOfSymbol(node.symbol).size === 0 && !aliasSymbol) {
+      if (!node.symbol || getMembersOfSymbol(node.symbol).size === 0 && !aliasSymbol) {
         links.resolvedType = emptyTypeLiteralType;
       } else {
         let type = createObjectType(16 /* Anonymous */, node.symbol);
@@ -62401,44 +62421,8 @@ function createTypeChecker(host) {
       if (!result) {
         const newMapper = createTypeMapper(root.outerTypeParameters, typeArguments);
         const checkType = root.checkType;
-        let distributionType = root.isDistributive ? getReducedType(getMappedType(checkType, newMapper)) : void 0;
-        let narrowingBaseType;
-        const forNarrowing = distributionType && isNarrowingSubstitutionType(distributionType) && isNarrowableConditionalType(type, mapper);
-        if (forNarrowing) {
-          narrowingBaseType = distributionType.baseType;
-          distributionType = getReducedType(distributionType.constraint);
-        }
-        if (distributionType && checkType !== distributionType && distributionType.flags & (1048576 /* Union */ | 131072 /* Never */)) {
-          const mapperCallback = narrowingBaseType ? (t) => getConditionalType(
-            root,
-            prependTypeMapping(checkType, getSubstitutionType(
-              narrowingBaseType,
-              t,
-              /*isNarrowed*/
-              true
-            ), newMapper),
-            forConstraint,
-            /*aliasSymbol*/
-            void 0,
-            /*aliasTypeArguments*/
-            void 0,
-            forNarrowing
-          ) : (t) => getConditionalType(root, prependTypeMapping(checkType, t, newMapper), forConstraint);
-          if (narrowingBaseType) {
-            result = mapType(
-              distributionType,
-              mapperCallback,
-              /*noReductions*/
-              void 0,
-              /*toIntersection*/
-              true
-            );
-          } else {
-            result = mapTypeWithAlias(distributionType, mapperCallback, aliasSymbol, aliasTypeArguments);
-          }
-        } else {
-          result = getConditionalType(root, newMapper, forConstraint, aliasSymbol, aliasTypeArguments, forNarrowing);
-        }
+        const distributionType = root.isDistributive ? getReducedType(getMappedType(checkType, newMapper)) : void 0;
+        result = distributionType && checkType !== distributionType && distributionType.flags & (1048576 /* Union */ | 131072 /* Never */) ? mapTypeWithAlias(distributionType, (t) => getConditionalType(root, prependTypeMapping(checkType, t, newMapper), forConstraint), aliasSymbol, aliasTypeArguments) : getConditionalType(root, newMapper, forConstraint, aliasSymbol, aliasTypeArguments);
         root.instantiations.set(id, result);
       }
       return result;
@@ -62551,9 +62535,6 @@ function createTypeChecker(host) {
     }
     return type;
   }
-  function isGenericIndexedOrConditionalReturnType(type) {
-    return !!(type.flags & (8388608 /* IndexedAccess */ | 16777216 /* Conditional */) && couldContainTypeVariables(type));
-  }
   function instantiateReverseMappedType(type, mapper) {
     const innerMappedType = instantiateType(type.mappedType, mapper);
     if (!(getObjectFlags(innerMappedType) & 32 /* Mapped */)) {
@@ -63584,12 +63565,10 @@ function createTypeChecker(host) {
   function shouldNormalizeIntersection(type) {
     let hasInstantiable = false;
     let hasNullableOrEmpty = false;
-    let hasSubstitution = false;
     for (const t of type.types) {
       hasInstantiable || (hasInstantiable = !!(t.flags & 465829888 /* Instantiable */));
       hasNullableOrEmpty || (hasNullableOrEmpty = !!(t.flags & 98304 /* Nullable */) || isEmptyAnonymousObjectType(t));
-      hasSubstitution || (hasSubstitution = isNarrowingSubstitutionType(t));
-      if (hasInstantiable && hasNullableOrEmpty || hasSubstitution) return true;
+      if (hasInstantiable && hasNullableOrEmpty) return true;
     }
     return false;
   }
@@ -68724,7 +68703,7 @@ function createTypeChecker(host) {
   function countTypes(type) {
     return type.flags & 1048576 /* Union */ ? type.types.length : 1;
   }
-  function mapType(type, mapper, noReductions, toIntersection) {
+  function mapType(type, mapper, noReductions) {
     if (type.flags & 131072 /* Never */) {
       return type;
     }
@@ -68746,7 +68725,7 @@ function createTypeChecker(host) {
         }
       }
     }
-    return changed ? mappedTypes && (toIntersection ? getIntersectionType(mappedTypes) : getUnionType(mappedTypes, noReductions ? 0 /* None */ : 1 /* Literal */)) : type;
+    return changed ? mappedTypes && getUnionType(mappedTypes, noReductions ? 0 /* None */ : 1 /* Literal */) : type;
   }
   function mapTypeWithAlias(type, mapper, aliasSymbol, aliasTypeArguments) {
     return type.flags & 1048576 /* Union */ && aliasSymbol ? getUnionType(map(type.types, mapper), 1 /* Literal */, aliasSymbol, aliasTypeArguments) : mapType(type, mapper);
@@ -70099,12 +70078,14 @@ function createTypeChecker(host) {
         case 80 /* Identifier */:
           if (!isMatchingReference(reference, expr) && inlineLevel < 5) {
             const symbol = getResolvedSymbol(expr);
-            const inlineExpression = getNarrowableInlineExpression(symbol);
-            if (inlineExpression && isConstantReference(reference)) {
-              inlineLevel++;
-              const result = narrowType(type, inlineExpression, assumeTrue);
-              inlineLevel--;
-              return result;
+            if (isConstantVariable(symbol)) {
+              const declaration = symbol.valueDeclaration;
+              if (declaration && isVariableDeclaration(declaration) && !declaration.type && declaration.initializer && isConstantReference(reference)) {
+                inlineLevel++;
+                const result = narrowType(type, declaration.initializer, assumeTrue);
+                inlineLevel--;
+                return result;
+              }
             }
           }
         // falls through
@@ -70139,14 +70120,6 @@ function createTypeChecker(host) {
       return type;
     }
   }
-  function getNarrowableInlineExpression(symbol) {
-    if (isConstantVariable(symbol)) {
-      const declaration = symbol.valueDeclaration;
-      if (declaration && isVariableDeclaration(declaration) && !declaration.type && declaration.initializer) {
-        return declaration.initializer;
-      }
-    }
-  }
   function getTypeOfSymbolAtLocation(symbol, location) {
     symbol = getExportSymbolOfValueSymbolIfExported(symbol);
     if (location.kind === 80 /* Identifier */ || location.kind === 81 /* PrivateIdentifier */) {
@@ -70336,11 +70309,11 @@ function createTypeChecker(host) {
     ));
     return contextualType && !isGenericType(contextualType);
   }
-  function getNarrowableTypeForReference(type, reference, checkMode, forReturnTypeNarrowing) {
+  function getNarrowableTypeForReference(type, reference, checkMode) {
     if (isNoInferType(type)) {
       type = type.baseType;
     }
-    const substituteConstraints = !(checkMode && checkMode & 2 /* Inferential */) && someType(type, isGenericTypeWithUnionConstraint) && (forReturnTypeNarrowing || isConstraintPosition(type, reference) || hasContextualTypeWithNoGenericTypes(reference, checkMode));
+    const substituteConstraints = !(checkMode && checkMode & 2 /* Inferential */) && someType(type, isGenericTypeWithUnionConstraint) && (isConstraintPosition(type, reference) || hasContextualTypeWithNoGenericTypes(reference, checkMode));
     return substituteConstraints ? mapType(type, getBaseConstraintOrType) : type;
   }
   function isExportOrExportExpression(location) {
@@ -71465,16 +71438,9 @@ function createTypeChecker(host) {
   function getContextualTypeForReturnExpression(node, contextFlags) {
     const func = getContainingFunction(node);
     if (func) {
-      const functionFlags = getFunctionFlags(func);
-      const links = getNodeLinks(node);
-      if (links.contextualReturnType) {
-        if (functionFlags & 2 /* Async */) {
-          return getUnionType([links.contextualReturnType, createPromiseLikeType(links.contextualReturnType)]);
-        }
-        return links.contextualReturnType;
-      }
       let contextualReturnType = getContextualReturnType(func, contextFlags);
       if (contextualReturnType) {
+        const functionFlags = getFunctionFlags(func);
         if (functionFlags & 1 /* Generator */) {
           const isAsyncGenerator = (functionFlags & 2 /* Async */) !== 0;
           if (contextualReturnType.flags & 1048576 /* Union */) {
@@ -72172,13 +72138,6 @@ function createTypeChecker(host) {
     if (index >= 0) {
       return contextualTypes[index];
     }
-    const links = getNodeLinks(node);
-    if (links.contextualReturnType) {
-      if (node.flags & 65536 /* AwaitContext */) {
-        return getUnionType([links.contextualReturnType, createPromiseLikeType(links.contextualReturnType)]);
-      }
-      return links.contextualReturnType;
-    }
     const { parent } = node;
     switch (parent.kind) {
       case 260 /* VariableDeclaration */:
@@ -82618,7 +82577,7 @@ function createTypeChecker(host) {
       return anyIterationTypes;
     }
     if (!(type.flags & 1048576 /* Union */)) {
-      const errorOutputContainer = errorNode ? { errors: void 0 } : void 0;
+      const errorOutputContainer = errorNode ? { errors: void 0, skipLogging: true } : void 0;
       const iterationTypes2 = getIterationTypesOfIterableWorker(type, use, errorNode, errorOutputContainer);
       if (iterationTypes2 === noIterationTypes) {
         if (errorNode) {
@@ -82786,11 +82745,27 @@ function createTypeChecker(host) {
     if (isTypeAny(methodType)) {
       return noCache ? anyIterationTypes : setCachedIterationTypes(type, resolver.iterableCacheKey, anyIterationTypes);
     }
-    const signatures = methodType ? getSignaturesOfType(methodType, 0 /* Call */) : void 0;
-    if (!some(signatures)) {
+    const allSignatures = methodType ? getSignaturesOfType(methodType, 0 /* Call */) : void 0;
+    const validSignatures = filter(allSignatures, (sig) => getMinArgumentCount(sig) === 0);
+    if (!some(validSignatures)) {
+      if (errorNode && some(allSignatures)) {
+        checkTypeAssignableTo(
+          type,
+          resolver.getGlobalIterableType(
+            /*reportErrors*/
+            true
+          ),
+          errorNode,
+          /*headMessage*/
+          void 0,
+          /*containingMessageChain*/
+          void 0,
+          errorOutputContainer
+        );
+      }
       return noCache ? noIterationTypes : setCachedIterationTypes(type, resolver.iterableCacheKey, noIterationTypes);
     }
-    const iteratorType = getIntersectionType(map(signatures, getReturnTypeOfSignature));
+    const iteratorType = getIntersectionType(map(validSignatures, getReturnTypeOfSignature));
     const iterationTypes = getIterationTypesOfIteratorWorker(iteratorType, resolver, errorNode, errorOutputContainer, noCache) ?? noIterationTypes;
     return noCache ? iterationTypes : setCachedIterationTypes(type, resolver.iterableCacheKey, iterationTypes);
   }
@@ -83068,234 +83043,34 @@ function createTypeChecker(host) {
     }
     const signature = getSignatureFromDeclaration(container);
     const returnType = getReturnTypeOfSignature(signature);
+    const functionFlags = getFunctionFlags(container);
     if (strictNullChecks || node.expression || returnType.flags & 131072 /* Never */) {
+      const exprType = node.expression ? checkExpressionCached(node.expression) : undefinedType;
       if (container.kind === 178 /* SetAccessor */) {
         if (node.expression) {
           error(node, Diagnostics.Setters_cannot_return_a_value);
         }
       } else if (container.kind === 176 /* Constructor */) {
-        const exprType = node.expression ? checkExpressionCached(node.expression) : undefinedType;
         if (node.expression && !checkTypeAssignableToAndOptionallyElaborate(exprType, returnType, node, node.expression)) {
           error(node, Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
         }
       } else if (getReturnTypeFromAnnotation(container)) {
-        checkReturnStatementExpression(container, returnType, node, node.expression);
+        const unwrappedReturnType = unwrapReturnType(returnType, functionFlags) ?? returnType;
+        const unwrappedExprType = functionFlags & 2 /* Async */ ? checkAwaitedType(
+          exprType,
+          /*withAlias*/
+          false,
+          node,
+          Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member
+        ) : exprType;
+        if (unwrappedReturnType) {
+          checkTypeAssignableToAndOptionallyElaborate(unwrappedExprType, unwrappedReturnType, node, node.expression);
+        }
       }
     } else if (container.kind !== 176 /* Constructor */ && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeUndefinedVoidOrAny(container, returnType)) {
       error(node, Diagnostics.Not_all_code_paths_return_a_value);
     }
   }
-  function checkReturnStatementExpression(container, returnType, node, expr) {
-    const functionFlags = getFunctionFlags(container);
-    const unwrappedReturnType = unwrapReturnType(returnType, functionFlags) ?? returnType;
-    if (expr) {
-      const unwrappedExpr = skipParentheses(expr);
-      if (isConditionalExpression(unwrappedExpr)) {
-        return checkReturnConditionalExpression(container, returnType, node, unwrappedExpr);
-      }
-    }
-    const exprType = expr ? checkExpressionCached(expr) : undefinedType;
-    const unwrappedExprType = functionFlags & 2 /* Async */ ? checkAwaitedType(
-      exprType,
-      /*withAlias*/
-      false,
-      node,
-      Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member
-    ) : exprType;
-    const errorNode = node.expression && isConditionalExpression(skipParentheses(node.expression)) ? expr : node;
-    if (checkTypeAssignableTo(
-      unwrappedExprType,
-      unwrappedReturnType,
-      /*errorNode*/
-      void 0
-    )) {
-      return;
-    }
-    if (!isGenericIndexedOrConditionalReturnType(unwrappedReturnType)) {
-      checkTypeAssignableToAndOptionallyElaborate(unwrappedExprType, unwrappedReturnType, errorNode, expr);
-      return;
-    }
-    const allTypeParameters = appendTypeParameters(getOuterTypeParameters(
-      container,
-      /*includeThisTypes*/
-      false
-    ), getEffectiveTypeParameterDeclarations(container));
-    const narrowableTypeParameters = allTypeParameters && getNarrowableTypeParameters(allTypeParameters);
-    if (!narrowableTypeParameters || !narrowableTypeParameters.length || !isNarrowableReturnType(unwrappedReturnType)) {
-      checkTypeAssignableToAndOptionallyElaborate(unwrappedExprType, unwrappedReturnType, errorNode, expr);
-      return;
-    }
-    let narrowPosition = node;
-    let narrowFlowNode = node.flowNode;
-    if (expr && isConditionalExpression(expr.parent)) {
-      narrowFlowNode = expr.parent.whenTrue === expr ? expr.parent.flowNodeWhenTrue : expr.parent.flowNodeWhenFalse;
-      narrowPosition = expr;
-    }
-    if (!narrowFlowNode) {
-      checkTypeAssignableToAndOptionallyElaborate(unwrappedExprType, unwrappedReturnType, errorNode, expr);
-      return;
-    }
-    const narrowed = mapDefined(narrowableTypeParameters, ([typeParam, symbol, reference]) => {
-      const narrowReference = factory.cloneNode(reference);
-      narrowReference.id = void 0;
-      getNodeLinks(narrowReference).resolvedSymbol = symbol;
-      setParent(narrowReference, narrowPosition.parent);
-      narrowReference.flowNode = narrowFlowNode;
-      const initialType = getNarrowableTypeForReference(
-        typeParam,
-        narrowReference,
-        /*checkMode*/
-        void 0,
-        /*forReturnTypeNarrowing*/
-        true
-      );
-      if (initialType === typeParam) {
-        return void 0;
-      }
-      const flowType = getFlowTypeOfReference(narrowReference, initialType);
-      const exprType2 = getTypeFromFlowType(flowType);
-      if (isTypeAny(exprType2) || isErrorType(exprType2) || exprType2 === typeParam || exprType2 === mapType(typeParam, getBaseConstraintOrType)) {
-        return void 0;
-      }
-      const narrowedType = getSubstitutionType(
-        typeParam,
-        exprType2,
-        /*isNarrowed*/
-        true
-      );
-      return [typeParam, narrowedType];
-    });
-    const narrowMapper = createTypeMapper(narrowed.map(([tp, _]) => tp), narrowed.map(([_, t]) => t));
-    const narrowedReturnType = instantiateType(
-      unwrappedReturnType,
-      narrowMapper
-    );
-    if (expr) {
-      const links = getNodeLinks(expr);
-      if (!links.contextualReturnType) {
-        links.contextualReturnType = narrowedReturnType;
-      }
-    }
-    const narrowedExprType = expr ? checkExpression(expr) : undefinedType;
-    const narrowedUnwrappedExprType = functionFlags & 2 /* Async */ ? checkAwaitedType(
-      narrowedExprType,
-      /*withAlias*/
-      false,
-      node,
-      Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member
-    ) : narrowedExprType;
-    checkTypeAssignableToAndOptionallyElaborate(narrowedUnwrappedExprType, narrowedReturnType, errorNode, expr);
-  }
-  function checkReturnConditionalExpression(container, returnType, node, expr) {
-    checkExpression(expr.condition);
-    checkReturnStatementExpression(container, returnType, node, expr.whenTrue);
-    checkReturnStatementExpression(container, returnType, node, expr.whenFalse);
-  }
-  function getNarrowableTypeParameters(candidates) {
-    const narrowableParams = [];
-    for (const typeParam of candidates) {
-      const constraint = getConstraintOfTypeParameter(typeParam);
-      if (!constraint || !(constraint.flags & 1048576 /* Union */)) continue;
-      if (typeParam.symbol && typeParam.symbol.declarations && typeParam.symbol.declarations.length === 1) {
-        const container = typeParam.symbol.declarations[0].parent;
-        if (!isFunctionLike(container)) continue;
-        let reference;
-        let hasInvalidReference = false;
-        for (const paramDecl of container.parameters) {
-          const typeNode = paramDecl.type;
-          if (!typeNode) continue;
-          if (isTypeParameterReferenced(typeParam, typeNode)) {
-            let candidateReference;
-            if (isTypeReferenceNode(typeNode) && isReferenceToTypeParameter(typeParam, typeNode) && (candidateReference = getValidParameterReference(paramDecl, constraint))) {
-              if (reference) {
-                hasInvalidReference = true;
-                break;
-              }
-              reference = candidateReference;
-              continue;
-            }
-            hasInvalidReference = true;
-            break;
-          }
-        }
-        if (!hasInvalidReference && reference) {
-          const symbol = getResolvedSymbol(reference);
-          if (symbol !== unknownSymbol) narrowableParams.push([typeParam, symbol, reference]);
-        }
-      }
-    }
-    return narrowableParams;
-    function getValidParameterReference(paramDecl, constraint) {
-      if (!isIdentifier(paramDecl.name)) return;
-      if (paramDecl.questionToken && !containsUndefinedType(constraint)) return;
-      return paramDecl.name;
-    }
-    function isReferenceToTypeParameter(typeParam, node) {
-      return getTypeFromTypeReference(node) === typeParam;
-    }
-    function isTypeParameterReferenced(typeParam, node) {
-      return isReferenced(node);
-      function isReferenced(node2) {
-        if (isTypeReferenceNode(node2)) {
-          return isReferenceToTypeParameter(typeParam, node2);
-        }
-        if (isTypeQueryNode(node2)) {
-          return isTypeParameterPossiblyReferenced(typeParam, node2);
-        }
-        return !!forEachChild(node2, isReferenced);
-      }
-    }
-  }
-  function isNarrowableReturnType(returnType) {
-    return isConditionalType(returnType) ? isNarrowableConditionalType(returnType) : !!(returnType.indexType.flags & 262144 /* TypeParameter */);
-  }
-  function isNarrowableConditionalType(type, mapper) {
-    const typeArguments = mapper && map(type.root.outerTypeParameters, (t) => {
-      const mapped = getMappedType(t, mapper);
-      if (isNarrowingSubstitutionType(mapped)) {
-        return mapped.baseType;
-      }
-      return mapped;
-    });
-    const id = `${type.id}:${getTypeListId(typeArguments)}`;
-    let result = narrowableReturnTypeCache.get(id);
-    if (result === void 0) {
-      const nonNarrowingMapper = type.root.outerTypeParameters && typeArguments && createTypeMapper(type.root.outerTypeParameters, typeArguments);
-      const instantiatedType = instantiateType(type, nonNarrowingMapper);
-      result = isConditionalType(instantiatedType) && isNarrowableConditionalTypeWorker(instantiatedType);
-      narrowableReturnTypeCache.set(id, result);
-    }
-    return result;
-  }
-  function isNarrowableConditionalTypeWorker(type) {
-    if (!type.root.isDistributive) {
-      return false;
-    }
-    if (type.root.inferTypeParameters) {
-      return false;
-    }
-    if (!(type.checkType.flags & 262144 /* TypeParameter */)) {
-      return false;
-    }
-    const constraintType = getConstraintOfTypeParameter(type.checkType);
-    if (!constraintType || !(constraintType.flags & 1048576 /* Union */)) {
-      return false;
-    }
-    if (!everyType(type.extendsType, (extendsType) => some(
-      constraintType.types,
-      (constraintType2) => isTypeIdenticalTo(constraintType2, extendsType)
-    ))) {
-      return false;
-    }
-    const trueType2 = getTrueTypeFromConditionalType(type);
-    const falseType2 = getFalseTypeFromConditionalType(type);
-    const isValidTrueType = isConditionalType(trueType2) ? isNarrowableConditionalType(trueType2) : true;
-    const isValidFalseType = isConditionalType(falseType2) ? isNarrowableConditionalType(falseType2) : falseType2 === neverType;
-    return isValidTrueType && isValidFalseType;
-  }
-  function isConditionalType(type) {
-    return !!(type.flags & 16777216 /* Conditional */);
-  }
   function checkWithStatement(node) {
     if (!checkGrammarStatementInAmbientContext(node)) {
       if (node.flags & 65536 /* AwaitContext */) {
@@ -84224,6 +83999,9 @@ function createTypeChecker(host) {
   }
   function checkInterfaceDeclaration(node) {
     if (!checkGrammarModifiers(node)) checkGrammarInterfaceDeclaration(node);
+    if (!allowBlockDeclarations(node.parent)) {
+      grammarErrorOnNode(node, Diagnostics._0_declarations_can_only_be_declared_inside_a_block, "interface");
+    }
     checkTypeParameters(node.typeParameters);
     addLazyDiagnostic(() => {
       checkTypeNameIsReserved(node.name, Diagnostics.Interface_name_cannot_be_0);
@@ -84258,6 +84036,9 @@ function createTypeChecker(host) {
   function checkTypeAliasDeclaration(node) {
     checkGrammarModifiers(node);
     checkTypeNameIsReserved(node.name, Diagnostics.Type_alias_name_cannot_be_0);
+    if (!allowBlockDeclarations(node.parent)) {
+      grammarErrorOnNode(node, Diagnostics._0_declarations_can_only_be_declared_inside_a_block, "type");
+    }
     checkExportsOnMergedDeclarations(node);
     checkTypeParameters(node.typeParameters);
     if (node.type.kind === 141 /* IntrinsicKeyword */) {
@@ -86644,7 +86425,7 @@ function createTypeChecker(host) {
     const typeNode = getNonlocalEffectiveTypeAnnotationNode(parameter);
     if (!typeNode) return false;
     const type = getTypeFromTypeNode(typeNode);
-    return containsUndefinedType(type);
+    return isErrorType(type) || containsUndefinedType(type);
   }
   function requiresAddingImplicitUndefined(parameter, enclosingDeclaration) {
     return (isRequiredInitializedParameter(parameter, enclosingDeclaration) || isOptionalUninitializedParameterProperty(parameter)) && !declaredParameterTypeContainsUndefined(parameter);
@@ -88670,7 +88451,7 @@ function createTypeChecker(host) {
     }
     return false;
   }
-  function allowLetAndConstDeclarations(parent) {
+  function allowBlockDeclarations(parent) {
     switch (parent.kind) {
       case 245 /* IfStatement */:
       case 246 /* DoStatement */:
@@ -88681,12 +88462,12 @@ function createTypeChecker(host) {
       case 250 /* ForOfStatement */:
         return false;
       case 256 /* LabeledStatement */:
-        return allowLetAndConstDeclarations(parent.parent);
+        return allowBlockDeclarations(parent.parent);
     }
     return true;
   }
   function checkGrammarForDisallowedBlockScopedVariableStatement(node) {
-    if (!allowLetAndConstDeclarations(node.parent)) {
+    if (!allowBlockDeclarations(node.parent)) {
       const blockScopeKind = getCombinedNodeFlagsCached(node.declarationList) & 7 /* BlockScoped */;
       if (blockScopeKind) {
         const keyword = blockScopeKind === 1 /* Let */ ? "let" : blockScopeKind === 2 /* Const */ ? "const" : blockScopeKind === 4 /* Using */ ? "using" : blockScopeKind === 6 /* AwaitUsing */ ? "await using" : Debug.fail("Unknown BlockScope flag");
@@ -91292,9 +91073,9 @@ function getDecoratorsOfParameters(node) {
   }
   return decorators;
 }
-function getAllDecoratorsOfClass(node) {
+function getAllDecoratorsOfClass(node, useLegacyDecorators) {
   const decorators = getDecorators(node);
-  const parameters = getDecoratorsOfParameters(getFirstConstructorWithBody(node));
+  const parameters = useLegacyDecorators ? getDecoratorsOfParameters(getFirstConstructorWithBody(node)) : void 0;
   if (!some(decorators) && !some(parameters)) {
     return void 0;
   }
@@ -91308,18 +91089,27 @@ function getAllDecoratorsOfClassElement(member, parent, useLegacyDecorators) {
     case 177 /* GetAccessor */:
     case 178 /* SetAccessor */:
       if (!useLegacyDecorators) {
-        return getAllDecoratorsOfMethod(member);
+        return getAllDecoratorsOfMethod(
+          member,
+          /*useLegacyDecorators*/
+          false
+        );
       }
-      return getAllDecoratorsOfAccessors(member, parent);
+      return getAllDecoratorsOfAccessors(
+        member,
+        parent,
+        /*useLegacyDecorators*/
+        true
+      );
     case 174 /* MethodDeclaration */:
-      return getAllDecoratorsOfMethod(member);
+      return getAllDecoratorsOfMethod(member, useLegacyDecorators);
     case 172 /* PropertyDeclaration */:
       return getAllDecoratorsOfProperty(member);
     default:
       return void 0;
   }
 }
-function getAllDecoratorsOfAccessors(accessor, parent) {
+function getAllDecoratorsOfAccessors(accessor, parent, useLegacyDecorators) {
   if (!accessor.body) {
     return void 0;
   }
@@ -91329,7 +91119,7 @@ function getAllDecoratorsOfAccessors(accessor, parent) {
     return void 0;
   }
   const decorators = getDecorators(firstAccessorWithDecorators);
-  const parameters = getDecoratorsOfParameters(setAccessor);
+  const parameters = useLegacyDecorators ? getDecoratorsOfParameters(setAccessor) : void 0;
   if (!some(decorators) && !some(parameters)) {
     return void 0;
   }
@@ -91340,12 +91130,12 @@ function getAllDecoratorsOfAccessors(accessor, parent) {
     setDecorators: setAccessor && getDecorators(setAccessor)
   };
 }
-function getAllDecoratorsOfMethod(method) {
+function getAllDecoratorsOfMethod(method, useLegacyDecorators) {
   if (!method.body) {
     return void 0;
   }
   const decorators = getDecorators(method);
-  const parameters = getDecoratorsOfParameters(method);
+  const parameters = useLegacyDecorators ? getDecoratorsOfParameters(method) : void 0;
   if (!some(decorators) && !some(parameters)) {
     return void 0;
   }
@@ -96979,7 +96769,11 @@ function transformLegacyDecorators(context) {
     }
   }
   function generateConstructorDecorationExpression(node) {
-    const allDecorators = getAllDecoratorsOfClass(node);
+    const allDecorators = getAllDecoratorsOfClass(
+      node,
+      /*useLegacyDecorators*/
+      true
+    );
     const decoratorExpressions = transformAllDecoratorsOfDeclaration(allDecorators);
     if (!decoratorExpressions) {
       return void 0;
@@ -97491,7 +97285,11 @@ function transformESDecorators(context) {
     let syntheticConstructor;
     let heritageClauses;
     let shouldTransformPrivateStaticElementsInClass = false;
-    const classDecorators = transformAllDecoratorsOfDeclaration(getAllDecoratorsOfClass(node));
+    const classDecorators = transformAllDecoratorsOfDeclaration(getAllDecoratorsOfClass(
+      node,
+      /*useLegacyDecorators*/
+      false
+    ));
     if (classDecorators) {
       classInfo2.classDecoratorsName = factory2.createUniqueName("_classDecorators", 16 /* Optimistic */ | 32 /* FileLevel */);
       classInfo2.classDescriptorName = factory2.createUniqueName("_classDescriptor", 16 /* Optimistic */ | 32 /* FileLevel */);
@@ -116986,15 +116784,88 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     return false;
   }
   function parenthesizeExpressionForNoAsi(node) {
-    if (!commentsDisabled && isPartiallyEmittedExpression(node) && willEmitLeadingNewLine(node)) {
-      const parseNode = getParseTreeNode(node);
-      if (parseNode && isParenthesizedExpression(parseNode)) {
-        const parens = factory.createParenthesizedExpression(node.expression);
-        setOriginalNode(parens, node);
-        setTextRange(parens, parseNode);
-        return parens;
+    if (!commentsDisabled) {
+      switch (node.kind) {
+        case 355 /* PartiallyEmittedExpression */:
+          if (willEmitLeadingNewLine(node)) {
+            const parseNode = getParseTreeNode(node);
+            if (parseNode && isParenthesizedExpression(parseNode)) {
+              const parens = factory.createParenthesizedExpression(node.expression);
+              setOriginalNode(parens, node);
+              setTextRange(parens, parseNode);
+              return parens;
+            }
+            return factory.createParenthesizedExpression(node);
+          }
+          return factory.updatePartiallyEmittedExpression(
+            node,
+            parenthesizeExpressionForNoAsi(node.expression)
+          );
+        case 211 /* PropertyAccessExpression */:
+          return factory.updatePropertyAccessExpression(
+            node,
+            parenthesizeExpressionForNoAsi(node.expression),
+            node.name
+          );
+        case 212 /* ElementAccessExpression */:
+          return factory.updateElementAccessExpression(
+            node,
+            parenthesizeExpressionForNoAsi(node.expression),
+            node.argumentExpression
+          );
+        case 213 /* CallExpression */:
+          return factory.updateCallExpression(
+            node,
+            parenthesizeExpressionForNoAsi(node.expression),
+            node.typeArguments,
+            node.arguments
+          );
+        case 215 /* TaggedTemplateExpression */:
+          return factory.updateTaggedTemplateExpression(
+            node,
+            parenthesizeExpressionForNoAsi(node.tag),
+            node.typeArguments,
+            node.template
+          );
+        case 225 /* PostfixUnaryExpression */:
+          return factory.updatePostfixUnaryExpression(
+            node,
+            parenthesizeExpressionForNoAsi(node.operand)
+          );
+        case 226 /* BinaryExpression */:
+          return factory.updateBinaryExpression(
+            node,
+            parenthesizeExpressionForNoAsi(node.left),
+            node.operatorToken,
+            node.right
+          );
+        case 227 /* ConditionalExpression */:
+          return factory.updateConditionalExpression(
+            node,
+            parenthesizeExpressionForNoAsi(node.condition),
+            node.questionToken,
+            node.whenTrue,
+            node.colonToken,
+            node.whenFalse
+          );
+        case 234 /* AsExpression */:
+          return factory.updateAsExpression(
+            node,
+            parenthesizeExpressionForNoAsi(node.expression),
+            node.type
+          );
+        case 238 /* SatisfiesExpression */:
+          return factory.updateSatisfiesExpression(
+            node,
+            parenthesizeExpressionForNoAsi(node.expression),
+            node.type
+          );
+        case 235 /* NonNullExpression */:
+          return factory.updateNonNullExpression(
+            node,
+            parenthesizeExpressionForNoAsi(node.expression)
+          );
       }
-      return factory.createParenthesizedExpression(node);
     }
     return node;
   }