@typescript-deploys/pr-build 5.5.0-pr-58028-14 → 5.5.0-pr-58045-49

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.5";
-var version = `${versionMajorMinor}.0-insiders.20240402`;
+var version = `${versionMajorMinor}.0-insiders.20240404`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -7369,7 +7369,6 @@ var Diagnostics = {
   Specify_emit_Slashchecking_behavior_for_imports_that_are_only_used_for_types: diag(6718, 3 /* Message */, "Specify_emit_Slashchecking_behavior_for_imports_that_are_only_used_for_types_6718", "Specify emit/checking behavior for imports that are only used for types."),
   Default_catch_clause_variables_as_unknown_instead_of_any: diag(6803, 3 /* Message */, "Default_catch_clause_variables_as_unknown_instead_of_any_6803", "Default catch clause variables as 'unknown' instead of 'any'."),
   Do_not_transform_or_elide_any_imports_or_exports_not_marked_as_type_only_ensuring_they_are_written_in_the_output_file_s_format_based_on_the_module_setting: diag(6804, 3 /* Message */, "Do_not_transform_or_elide_any_imports_or_exports_not_marked_as_type_only_ensuring_they_are_written_i_6804", "Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting."),
-  Default_type_arguments_to_parameter_s_constraint_or_unknown_instead_of_any_for_instance_checks: diag(6805, 3 /* Message */, "Default_type_arguments_to_parameter_s_constraint_or_unknown_instead_of_any_for_instance_checks_6805", "Default type arguments to parameter's constraint or 'unknown' instead of 'any' for instance checks."),
   one_of_Colon: diag(6900, 3 /* Message */, "one_of_Colon_6900", "one of:"),
   one_or_more_Colon: diag(6901, 3 /* Message */, "one_or_more_Colon_6901", "one or more:"),
   type_Colon: diag(6902, 3 /* Message */, "type_Colon_6902", "type:"),
@@ -11748,8 +11747,11 @@ function getTokenPosOfNode(node, sourceFile, includeJsDoc) {
   if (includeJsDoc && hasJSDocNodes(node)) {
     return getTokenPosOfNode(node.jsDoc[0], sourceFile);
   }
-  if (node.kind === 352 /* SyntaxList */ && node._children.length > 0) {
-    return getTokenPosOfNode(node._children[0], sourceFile, includeJsDoc);
+  if (node.kind === 352 /* SyntaxList */) {
+    const first2 = firstOrUndefined(getNodeChildren(node));
+    if (first2) {
+      return getTokenPosOfNode(first2, sourceFile, includeJsDoc);
+    }
   }
   return skipTrivia(
     (sourceFile || getSourceFileOfNode(node)).text,
@@ -16597,12 +16599,6 @@ var computedOptions = createComputedCompilerOptions({
     computeValue: (compilerOptions) => {
       return getStrictOptionValue(compilerOptions, "useUnknownInCatchVariables");
     }
-  },
-  strictInstanceOfTypeParameters: {
-    dependencies: ["strict"],
-    computeValue: (compilerOptions) => {
-      return getStrictOptionValue(compilerOptions, "strictInstanceOfTypeParameters");
-    }
   }
 });
 var getEmitScriptTarget = computedOptions.target.computeValue;
@@ -17694,79 +17690,81 @@ function replaceFirstStar(s, replacement) {
 function getNameFromImportAttribute(node) {
   return isIdentifier(node.name) ? node.name.escapedText : escapeLeadingUnderscores(node.name.text);
 }
-function isSyntacticallyString(expr) {
-  expr = skipOuterExpressions(expr);
-  switch (expr.kind) {
-    case 226 /* BinaryExpression */:
-      const left = expr.left;
-      const right = expr.right;
-      return expr.operatorToken.kind === 40 /* PlusToken */ && (isSyntacticallyString(left) || isSyntacticallyString(right));
-    case 228 /* TemplateExpression */:
-    case 11 /* StringLiteral */:
-    case 15 /* NoSubstitutionTemplateLiteral */:
-      return true;
-  }
-  return false;
+function evaluatorResult(value, isSyntacticallyString = false, resolvedOtherFiles = false) {
+  return { value, isSyntacticallyString, resolvedOtherFiles };
 }
 function createEvaluator({ evaluateElementAccessExpression, evaluateEntityNameExpression }) {
   function evaluate(expr, location) {
+    let isSyntacticallyString = false;
+    let resolvedOtherFiles = false;
+    expr = skipParentheses(expr);
     switch (expr.kind) {
       case 224 /* PrefixUnaryExpression */:
-        const value = evaluate(expr.operand, location);
-        if (typeof value === "number") {
+        const result = evaluate(expr.operand, location);
+        resolvedOtherFiles = result.resolvedOtherFiles;
+        if (typeof result.value === "number") {
           switch (expr.operator) {
             case 40 /* PlusToken */:
-              return value;
+              return evaluatorResult(result.value, isSyntacticallyString, resolvedOtherFiles);
             case 41 /* MinusToken */:
-              return -value;
+              return evaluatorResult(-result.value, isSyntacticallyString, resolvedOtherFiles);
             case 55 /* TildeToken */:
-              return ~value;
+              return evaluatorResult(~result.value, isSyntacticallyString, resolvedOtherFiles);
           }
         }
         break;
-      case 226 /* BinaryExpression */:
+      case 226 /* BinaryExpression */: {
         const left = evaluate(expr.left, location);
         const right = evaluate(expr.right, location);
-        if (typeof left === "number" && typeof right === "number") {
+        isSyntacticallyString = (left.isSyntacticallyString || right.isSyntacticallyString) && expr.operatorToken.kind === 40 /* PlusToken */;
+        resolvedOtherFiles = left.resolvedOtherFiles || right.resolvedOtherFiles;
+        if (typeof left.value === "number" && typeof right.value === "number") {
           switch (expr.operatorToken.kind) {
             case 52 /* BarToken */:
-              return left | right;
+              return evaluatorResult(left.value | right.value, isSyntacticallyString, resolvedOtherFiles);
             case 51 /* AmpersandToken */:
-              return left & right;
+              return evaluatorResult(left.value & right.value, isSyntacticallyString, resolvedOtherFiles);
             case 49 /* GreaterThanGreaterThanToken */:
-              return left >> right;
+              return evaluatorResult(left.value >> right.value, isSyntacticallyString, resolvedOtherFiles);
             case 50 /* GreaterThanGreaterThanGreaterThanToken */:
-              return left >>> right;
+              return evaluatorResult(left.value >>> right.value, isSyntacticallyString, resolvedOtherFiles);
             case 48 /* LessThanLessThanToken */:
-              return left << right;
+              return evaluatorResult(left.value << right.value, isSyntacticallyString, resolvedOtherFiles);
             case 53 /* CaretToken */:
-              return left ^ right;
+              return evaluatorResult(left.value ^ right.value, isSyntacticallyString, resolvedOtherFiles);
             case 42 /* AsteriskToken */:
-              return left * right;
+              return evaluatorResult(left.value * right.value, isSyntacticallyString, resolvedOtherFiles);
             case 44 /* SlashToken */:
-              return left / right;
+              return evaluatorResult(left.value / right.value, isSyntacticallyString, resolvedOtherFiles);
             case 40 /* PlusToken */:
-              return left + right;
+              return evaluatorResult(left.value + right.value, isSyntacticallyString, resolvedOtherFiles);
             case 41 /* MinusToken */:
-              return left - right;
+              return evaluatorResult(left.value - right.value, isSyntacticallyString, resolvedOtherFiles);
             case 45 /* PercentToken */:
-              return left % right;
+              return evaluatorResult(left.value % right.value, isSyntacticallyString, resolvedOtherFiles);
             case 43 /* AsteriskAsteriskToken */:
-              return left ** right;
+              return evaluatorResult(left.value ** right.value, isSyntacticallyString, resolvedOtherFiles);
           }
-        } else if ((typeof left === "string" || typeof left === "number") && (typeof right === "string" || typeof right === "number") && expr.operatorToken.kind === 40 /* PlusToken */) {
-          return "" + left + right;
+        } else if ((typeof left.value === "string" || typeof left.value === "number") && (typeof right.value === "string" || typeof right.value === "number") && expr.operatorToken.kind === 40 /* PlusToken */) {
+          return evaluatorResult(
+            "" + left.value + right.value,
+            isSyntacticallyString,
+            resolvedOtherFiles
+          );
         }
         break;
+      }
       case 11 /* StringLiteral */:
       case 15 /* NoSubstitutionTemplateLiteral */:
-        return expr.text;
+        return evaluatorResult(
+          expr.text,
+          /*isSyntacticallyString*/
+          true
+        );
       case 228 /* TemplateExpression */:
         return evaluateTemplateExpression(expr, location);
       case 9 /* NumericLiteral */:
-        return +expr.text;
-      case 217 /* ParenthesizedExpression */:
-        return evaluate(expr.expression, location);
+        return evaluatorResult(+expr.text);
       case 80 /* Identifier */:
         return evaluateEntityNameExpression(expr, location);
       case 211 /* PropertyAccessExpression */:
@@ -17777,19 +17775,36 @@ function createEvaluator({ evaluateElementAccessExpression, evaluateEntityNameEx
       case 212 /* ElementAccessExpression */:
         return evaluateElementAccessExpression(expr, location);
     }
-    return void 0;
+    return evaluatorResult(
+      /*value*/
+      void 0,
+      isSyntacticallyString,
+      resolvedOtherFiles
+    );
   }
   function evaluateTemplateExpression(expr, location) {
     let result = expr.head.text;
+    let resolvedOtherFiles = false;
     for (const span of expr.templateSpans) {
-      const value = evaluate(span.expression, location);
-      if (value === void 0) {
-        return void 0;
+      const spanResult = evaluate(span.expression, location);
+      if (spanResult.value === void 0) {
+        return evaluatorResult(
+          /*value*/
+          void 0,
+          /*isSyntacticallyString*/
+          true
+        );
       }
-      result += value;
+      result += spanResult.value;
       result += span.literal.text;
+      resolvedOtherFiles || (resolvedOtherFiles = spanResult.resolvedOtherFiles);
     }
-    return result;
+    return evaluatorResult(
+      result,
+      /*isSyntacticallyString*/
+      true,
+      resolvedOtherFiles
+    );
   }
   return evaluate;
 }
@@ -21933,7 +21948,7 @@ function createNodeFactory(flags, baseFactory2) {
   }
   function createSyntaxList(children) {
     const node = createBaseNode(352 /* SyntaxList */);
-    node._children = children;
+    setNodeChildren(node, children);
     return node;
   }
   function createNotEmittedStatement(original) {
@@ -24710,6 +24725,19 @@ function isJSDocImportTag(node) {
   return node.kind === 351 /* JSDocImportTag */;
 }
 
+// src/compiler/factory/nodeChildren.ts
+var nodeChildren = /* @__PURE__ */ new WeakMap();
+function getNodeChildren(node) {
+  return nodeChildren.get(node);
+}
+function setNodeChildren(node, children) {
+  nodeChildren.set(node, children);
+  return children;
+}
+function unsetNodeChildren(node) {
+  nodeChildren.delete(node);
+}
+
 // src/compiler/factory/utilities.ts
 function createEmptyExports(factory2) {
   return factory2.createExportDeclaration(
@@ -33341,9 +33369,7 @@ var IncrementalParser;
       if (aggressiveChecks && shouldCheckNode(node)) {
         text = oldText.substring(node.pos, node.end);
       }
-      if (node._children) {
-        node._children = void 0;
-      }
+      unsetNodeChildren(node);
       setTextRangePosEnd(node, node.pos + delta, node.end + delta);
       if (aggressiveChecks && shouldCheckNode(node)) {
         Debug.assert(text === newText.substring(node.pos, node.end));
@@ -33357,7 +33383,6 @@ var IncrementalParser;
       checkNodePositions(node, aggressiveChecks);
     }
     function visitArray2(array) {
-      array._children = void 0;
       setTextRangePosEnd(array, array.pos + delta, array.end + delta);
       for (const node of array) {
         visitNode3(node);
@@ -33429,7 +33454,7 @@ var IncrementalParser;
       const fullEnd = child.end;
       if (fullEnd >= changeStart) {
         child.intersectsChange = true;
-        child._children = void 0;
+        unsetNodeChildren(child);
         adjustIntersectingElement(child, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta);
         forEachChild(child, visitNode3, visitArray2);
         if (hasJSDocNodes(child)) {
@@ -33459,7 +33484,6 @@ var IncrementalParser;
       const fullEnd = array.end;
       if (fullEnd >= changeStart) {
         array.intersectsChange = true;
-        array._children = void 0;
         adjustIntersectingElement(array, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta);
         for (const node of array) {
           visitNode3(node);
@@ -34569,16 +34593,6 @@ var commandOptionsWithoutBuild = [
     description: Diagnostics.Check_for_class_properties_that_are_declared_but_not_set_in_the_constructor,
     defaultValueDescription: Diagnostics.false_unless_strict_is_set
   },
-  {
-    name: "strictInstanceOfTypeParameters",
-    type: "boolean",
-    affectsSemanticDiagnostics: true,
-    affectsBuildInfo: true,
-    strictFlag: true,
-    category: Diagnostics.Type_Checking,
-    description: Diagnostics.Default_type_arguments_to_parameter_s_constraint_or_unknown_instead_of_any_for_instance_checks,
-    defaultValueDescription: false
-  },
   {
     name: "noImplicitThis",
     type: "boolean",
@@ -43519,7 +43533,6 @@ function createTypeChecker(host) {
   var noImplicitAny = getStrictOptionValue(compilerOptions, "noImplicitAny");
   var noImplicitThis = getStrictOptionValue(compilerOptions, "noImplicitThis");
   var useUnknownInCatchVariables = getStrictOptionValue(compilerOptions, "useUnknownInCatchVariables");
-  var strictInstanceOfTypeParameters = getStrictOptionValue(compilerOptions, "strictInstanceOfTypeParameters");
   var exactOptionalPropertyTypes = compilerOptions.exactOptionalPropertyTypes;
   var checkBinaryExpression = createCheckBinaryExpression();
   var emitResolver = createResolver();
@@ -43560,6 +43573,7 @@ function createTypeChecker(host) {
     isArgumentsSymbol: (symbol) => symbol === argumentsSymbol,
     isUnknownSymbol: (symbol) => symbol === unknownSymbol,
     getMergedSymbol,
+    symbolIsValue,
     getDiagnostics,
     getGlobalDiagnostics,
     getRecursionIdentity,
@@ -49128,68 +49142,7 @@ function createTypeChecker(host) {
         /*skipUnionExpanding*/
         true
       )[0];
-      let cleanup;
-      if (context.enclosingDeclaration && signature.declaration && signature.declaration !== context.enclosingDeclaration && !isInJSFile(signature.declaration) && (some(expandedParams) || some(signature.typeParameters))) {
-        let pushFakeScope2 = function(kind2, addAll) {
-          Debug.assert(context.enclosingDeclaration);
-          let existingFakeScope;
-          if (getNodeLinks(context.enclosingDeclaration).fakeScopeForSignatureDeclaration === kind2) {
-            existingFakeScope = context.enclosingDeclaration;
-          } else if (context.enclosingDeclaration.parent && getNodeLinks(context.enclosingDeclaration.parent).fakeScopeForSignatureDeclaration === kind2) {
-            existingFakeScope = context.enclosingDeclaration.parent;
-          }
-          Debug.assertOptionalNode(existingFakeScope, isBlock);
-          const locals = (existingFakeScope == null ? void 0 : existingFakeScope.locals) ?? createSymbolTable();
-          let newLocals;
-          addAll((name, symbol) => {
-            if (!locals.has(name)) {
-              newLocals = append(newLocals, name);
-              locals.set(name, symbol);
-            }
-          });
-          if (!newLocals)
-            return;
-          const oldCleanup = cleanup;
-          function undo() {
-            forEach(newLocals, (s) => locals.delete(s));
-            oldCleanup == null ? void 0 : oldCleanup();
-          }
-          if (existingFakeScope) {
-            cleanup = undo;
-          } else {
-            const fakeScope = parseNodeFactory.createBlock(emptyArray);
-            getNodeLinks(fakeScope).fakeScopeForSignatureDeclaration = kind2;
-            fakeScope.locals = locals;
-            const saveEnclosingDeclaration = context.enclosingDeclaration;
-            setParent(fakeScope, saveEnclosingDeclaration);
-            context.enclosingDeclaration = fakeScope;
-            cleanup = () => {
-              context.enclosingDeclaration = saveEnclosingDeclaration;
-              undo();
-            };
-          }
-        };
-        var pushFakeScope = pushFakeScope2;
-        pushFakeScope2(
-          "params",
-          (add) => {
-            for (const param of expandedParams) {
-              add(param.escapedName, param);
-            }
-          }
-        );
-        if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */) {
-          pushFakeScope2(
-            "typeParams",
-            (add) => {
-              for (const typeParam of signature.typeParameters ?? emptyArray) {
-                const typeParamName = typeParameterToName(typeParam, context).escapedText;
-                add(typeParamName, typeParam.symbol);
-              }
-            }
-          );
-        }
-      }
+      const cleanup = enterNewScope(context, signature.declaration, expandedParams, signature.typeParameters);
       const parameters = (some(expandedParams, (p) => p !== expandedParams[expandedParams.length - 1] && !!(getCheckFlags(p) & 32768 /* RestParameter */)) ? signature.parameters : expandedParams).map((parameter) => symbolToParameterDeclaration(parameter, context, kind === 176 /* Constructor */));
       const thisParameter = context.flags & 33554432 /* OmitThisParameter */ ? void 0 : tryGetThisParameterDeclaration(signature, context);
       if (thisParameter) {
@@ -49280,6 +49233,111 @@ function createTypeChecker(host) {
       cleanup == null ? void 0 : cleanup();
       return node;
     }
+    function isNewScopeNode(node) {
+      return isFunctionLike(node) || isJSDocSignature(node) || isMappedTypeNode(node);
+    }
+    function getTypeParametersInScope(node) {
+      return isFunctionLike(node) || isJSDocSignature(node) ? getSignatureFromDeclaration(node).typeParameters : isConditionalTypeNode(node) ? getInferTypeParameters(node) : [getDeclaredTypeOfTypeParameter(getSymbolOfDeclaration(node.typeParameter))];
+    }
+    function getParametersInScope(node) {
+      return isFunctionLike(node) || isJSDocSignature(node) ? getExpandedParameters(
+        getSignatureFromDeclaration(node),
+        /*skipUnionExpanding*/
+        true
+      )[0] : void 0;
+    }
+    function enterNewScope(context, declaration, expandedParams, typeParameters) {
+      let cleanup;
+      if (context.enclosingDeclaration && declaration && declaration !== context.enclosingDeclaration && !isInJSFile(declaration) && (some(expandedParams) || some(typeParameters))) {
+        let pushFakeScope2 = function(kind, addAll) {
+          Debug.assert(context.enclosingDeclaration);
+          let existingFakeScope;
+          if (getNodeLinks(context.enclosingDeclaration).fakeScopeForSignatureDeclaration === kind) {
+            existingFakeScope = context.enclosingDeclaration;
+          } else if (context.enclosingDeclaration.parent && getNodeLinks(context.enclosingDeclaration.parent).fakeScopeForSignatureDeclaration === kind) {
+            existingFakeScope = context.enclosingDeclaration.parent;
+          }
+          Debug.assertOptionalNode(existingFakeScope, isBlock);
+          const locals = (existingFakeScope == null ? void 0 : existingFakeScope.locals) ?? createSymbolTable();
+          let newLocals;
+          addAll((name, symbol) => {
+            if (!locals.has(name)) {
+              newLocals = append(newLocals, name);
+              locals.set(name, symbol);
+            }
+          });
+          if (!newLocals)
+            return;
+          const oldCleanup = cleanup;
+          function undo() {
+            forEach(newLocals, (s) => locals.delete(s));
+            oldCleanup == null ? void 0 : oldCleanup();
+          }
+          if (existingFakeScope) {
+            cleanup = undo;
+          } else {
+            const fakeScope = parseNodeFactory.createBlock(emptyArray);
+            getNodeLinks(fakeScope).fakeScopeForSignatureDeclaration = kind;
+            fakeScope.locals = locals;
+            const saveEnclosingDeclaration = context.enclosingDeclaration;
+            setParent(fakeScope, saveEnclosingDeclaration);
+            context.enclosingDeclaration = fakeScope;
+            cleanup = () => {
+              context.enclosingDeclaration = saveEnclosingDeclaration;
+              undo();
+            };
+          }
+        };
+        var pushFakeScope = pushFakeScope2;
+        pushFakeScope2(
+          "params",
+          (add) => {
+            for (const param of expandedParams ?? emptyArray) {
+              if (!forEach(param.declarations, (d) => {
+                if (isParameter(d) && isBindingPattern(d.name)) {
+                  bindPattern(d.name);
+                  return true;
+                }
+                return void 0;
+                function bindPattern(p) {
+                  forEach(p.elements, (e) => {
+                    switch (e.kind) {
+                      case 232 /* OmittedExpression */:
+                        return;
+                      case 208 /* BindingElement */:
+                        return bindElement(e);
+                      default:
+                        return Debug.assertNever(e);
+                    }
+                  });
+                }
+                function bindElement(e) {
+                  if (isBindingPattern(e.name)) {
+                    return bindPattern(e.name);
+                  }
+                  const symbol = getSymbolOfDeclaration(e);
+                  add(symbol.escapedName, symbol);
+                }
+              })) {
+                add(param.escapedName, param);
+              }
+            }
+          }
+        );
+        if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */) {
+          pushFakeScope2(
+            "typeParams",
+            (add) => {
+              for (const typeParam of typeParameters ?? emptyArray) {
+                const typeParamName = typeParameterToName(typeParam, context).escapedText;
+                add(typeParamName, typeParam.symbol);
+              }
+            }
+          );
+        }
+        return cleanup;
+      }
+    }
     function tryGetThisParameterDeclaration(signature, context) {
       if (signature.thisParameter) {
         return symbolToParameterDeclaration(signature.thisParameter, context);
@@ -49898,6 +49956,9 @@ function createTypeChecker(host) {
       if (initial.typeParameterSymbolList) {
         initial.typeParameterSymbolList = new Set(initial.typeParameterSymbolList);
       }
+      if (initial.typeParameterNamesByTextNextNameCount) {
+        initial.typeParameterNamesByTextNextNameCount = new Map(initial.typeParameterNamesByTextNextNameCount);
+      }
       initial.tracker = new SymbolTrackerImpl(initial, initial.tracker.inner, initial.tracker.moduleResolverHost);
       return initial;
     }
@@ -49905,7 +49966,16 @@ function createTypeChecker(host) {
       return symbol.declarations && find(symbol.declarations, (s) => !!getNonlocalEffectiveTypeAnnotationNode(s) && (!enclosingDeclaration || !!findAncestor(s, (n) => n === enclosingDeclaration)));
     }
     function existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type) {
-      return !(getObjectFlags(type) & 4 /* Reference */) || !isTypeReferenceNode(existing) || length(existing.typeArguments) >= getMinTypeArgumentCount(type.target.typeParameters);
+      if (!(getObjectFlags(type) & 4 /* Reference */))
+        return true;
+      if (!isTypeReferenceNode(existing))
+        return true;
+      void getTypeFromTypeReference(existing);
+      const symbol = getNodeLinks(existing).resolvedSymbol;
+      const existingTarget = symbol && getDeclaredTypeOfSymbol(symbol);
+      if (!existingTarget || existingTarget !== type.target)
+        return true;
+      return length(existing.typeArguments) >= getMinTypeArgumentCount(type.target.typeParameters);
     }
     function getEnclosingDeclarationIgnoringFakeScope(enclosingDeclaration) {
       while (getNodeLinks(enclosingDeclaration).fakeScopeForSignatureDeclaration) {
@@ -50010,14 +50080,27 @@ function createTypeChecker(host) {
         } else {
           context.tracker.trackSymbol(sym, context.enclosingDeclaration, meaning);
         }
-        if (isIdentifier(node)) {
+        return { introducesError, node: attachSymbolToLeftmostIdentifier(node) };
+      }
+      return { introducesError, node };
+      function attachSymbolToLeftmostIdentifier(node2) {
+        if (node2 === leftmost) {
           const type = getDeclaredTypeOfSymbol(sym);
-          const name = sym.flags & 262144 /* TypeParameter */ ? typeParameterToName(type, context) : factory.cloneNode(node);
+          const name = sym.flags & 262144 /* TypeParameter */ ? typeParameterToName(type, context) : factory.cloneNode(node2);
           name.symbol = sym;
-          return { introducesError, node: setTextRange(setEmitFlags(setOriginalNode(name, node), 16777216 /* NoAsciiEscaping */), node) };
+          return setTextRange(setEmitFlags(setOriginalNode(name, node2), 16777216 /* NoAsciiEscaping */), node2);
+        }
+        const updated = visitEachChild(
+          node2,
+          (c) => attachSymbolToLeftmostIdentifier(c),
+          /*context*/
+          void 0
+        );
+        if (updated !== node2) {
+          setTextRange(updated, node2);
         }
+        return updated;
       }
-      return { introducesError, node };
     }
     function tryReuseExistingTypeNodeHelper(context, existing) {
       if (cancellationToken && cancellationToken.throwIfCancellationRequested) {
@@ -50030,6 +50113,22 @@ function createTypeChecker(host) {
       }
       return transformed === existing ? setTextRange(factory.cloneNode(existing), existing) : transformed;
       function visitExistingNodeTreeSymbols(node) {
+        const onExitNewScope = isNewScopeNode(node) ? onEnterNewScope(node) : void 0;
+        const result = visitExistingNodeTreeSymbolsWorker(node);
+        onExitNewScope == null ? void 0 : onExitNewScope();
+        return result;
+      }
+      function onEnterNewScope(node) {
+        const oldContex = context;
+        context = cloneNodeBuilderContext(context);
+        const cleanup = enterNewScope(context, node, getParametersInScope(node), getTypeParametersInScope(node));
+        return onExitNewScope;
+        function onExitNewScope() {
+          cleanup == null ? void 0 : cleanup();
+          context = oldContex;
+        }
+      }
+      function visitExistingNodeTreeSymbolsWorker(node) {
         if (isJSDocAllType(node) || node.kind === 319 /* JSDocNamepathType */) {
           return factory.createKeywordTypeNode(133 /* AnyKeyword */);
         }
@@ -50162,11 +50261,12 @@ function createTypeChecker(host) {
           return visited;
         }
         if (isEntityName(node) || isEntityNameExpression(node)) {
+          if (isDeclarationName(node)) {
+            return node;
+          }
           const { introducesError, node: result } = trackExistingEntityName(node, context);
           hadError = hadError || introducesError;
-          if (result !== node) {
-            return result;
-          }
+          return result;
         }
         if (isTupleTypeNode(node) || isTypeLiteralNode(node) || isMappedTypeNode(node)) {
           const visited = visitEachChild(
@@ -50180,6 +50280,21 @@ function createTypeChecker(host) {
           setEmitFlags(clone, flags | (context.flags & 1024 /* MultilineObjectLiterals */ && isTypeLiteralNode(node) ? 0 : 1 /* SingleLine */));
           return clone;
         }
+        if (isConditionalTypeNode(node)) {
+          const checkType = visitNode(node.checkType, visitExistingNodeTreeSymbols, isTypeNode);
+          const disposeScope = onEnterNewScope(node);
+          const extendType = visitNode(node.extendsType, visitExistingNodeTreeSymbols, isTypeNode);
+          const trueType2 = visitNode(node.trueType, visitExistingNodeTreeSymbols, isTypeNode);
+          disposeScope();
+          const falseType2 = visitNode(node.falseType, visitExistingNodeTreeSymbols, isTypeNode);
+          return factory.updateConditionalTypeNode(
+            node,
+            checkType,
+            extendType,
+            trueType2,
+            falseType2
+          );
+        }
         return visitEachChild(
           node,
           visitExistingNodeTreeSymbols,
@@ -52051,32 +52166,9 @@ function createTypeChecker(host) {
       }
     }).parent;
   }
-  function getInstanceTypeOfClassSymbol(classSymbol) {
-    const classType = getDeclaredTypeOfSymbol(classSymbol);
-    const objectFlags = getObjectFlags(classType);
-    if (!(objectFlags & 3 /* ClassOrInterface */) || !classType.typeParameters) {
-      return classType;
-    }
-    const variances = getVariances(classType);
-    const isJs = some(classSymbol.declarations, isInJSFile);
-    const inferredTypes = calculateInferredTypeArguments(classType.typeParameters, isJs);
-    const typeArguments = map(inferredTypes, (inferredType, i) => {
-      if (!strictInstanceOfTypeParameters) {
-        return anyType;
-      }
-      const variance = variances[i];
-      switch (variance & 7 /* VarianceMask */) {
-        case 2 /* Contravariant */:
-        case 3 /* Bivariant */:
-          return neverType;
-      }
-      return inferredType || unknownType;
-    });
-    return createTypeReference(classType, typeArguments);
-  }
   function getTypeOfPrototypeProperty(prototype) {
-    const classSymbol = getParentOfSymbol(prototype);
-    return getInstanceTypeOfClassSymbol(classSymbol);
+    const classType = getDeclaredTypeOfSymbol(getParentOfSymbol(prototype));
+    return classType.typeParameters ? createTypeReference(classType, map(classType.typeParameters, (_) => anyType)) : classType;
   }
   function getTypeOfPropertyOfType(type, name) {
     const prop = getPropertyOfType(type, name);
@@ -53703,7 +53795,7 @@ function createTypeChecker(host) {
             for (const member of declaration.members) {
               if (hasBindableName(member)) {
                 const memberSymbol = getSymbolOfDeclaration(member);
-                const value = getEnumMemberValue(member);
+                const value = getEnumMemberValue(member).value;
                 const memberType = getFreshTypeOfLiteralType(
                   value !== void 0 ? getEnumLiteralType(value, getSymbolId(symbol), memberSymbol) : createComputedEnumType(memberSymbol)
                 );
@@ -55777,26 +55869,6 @@ function createTypeChecker(host) {
     }
     return typeArguments && typeArguments.slice();
   }
-  function calculateInferredTypeArguments(typeParameters, isJavaScriptImplicitAny) {
-    const numTypeParameters = length(typeParameters);
-    if (!numTypeParameters) {
-      return [];
-    }
-    const result = [];
-    for (let i = 0; i < numTypeParameters; i++) {
-      result[i] = errorType;
-    }
-    const baseDefaultType = getDefaultTypeArgumentType(isJavaScriptImplicitAny);
-    for (let i = 0; i < numTypeParameters; i++) {
-      let inferredType = getBaseConstraintOfType(typeParameters[i]);
-      if (isJavaScriptImplicitAny && inferredType && (isTypeIdenticalTo(inferredType, unknownType) || isTypeIdenticalTo(inferredType, emptyObjectType))) {
-        inferredType = anyType;
-      }
-      result[i] = inferredType ? instantiateType(inferredType, createTypeMapper(typeParameters, result)) : baseDefaultType;
-    }
-    result.length = typeParameters.length;
-    return result;
-  }
   function getSignatureFromDeclaration(declaration) {
     const links = getNodeLinks(declaration);
     if (!links.resolvedSignature) {
@@ -60859,8 +60931,8 @@ function createTypeChecker(host) {
           }
           return false;
         }
-        const sourceValue = getEnumMemberValue(getDeclarationOfKind(sourceProperty, 306 /* EnumMember */));
-        const targetValue = getEnumMemberValue(getDeclarationOfKind(targetProperty, 306 /* EnumMember */));
+        const sourceValue = getEnumMemberValue(getDeclarationOfKind(sourceProperty, 306 /* EnumMember */)).value;
+        const targetValue = getEnumMemberValue(getDeclarationOfKind(targetProperty, 306 /* EnumMember */)).value;
         if (sourceValue !== targetValue) {
           const sourceIsString = typeof sourceValue === "string";
           const targetIsString = typeof targetValue === "string";
@@ -67106,8 +67178,8 @@ function createTypeChecker(host) {
       if (symbol === void 0) {
         return type;
       }
-      const classSymbol = getParentOfSymbol(symbol);
-      const targetType = hasStaticModifier(Debug.checkDefined(symbol.valueDeclaration, "should always have a declaration")) ? getTypeOfSymbol(classSymbol) : getInstanceTypeOfClassSymbol(classSymbol);
+      const classSymbol = symbol.parent;
+      const targetType = hasStaticModifier(Debug.checkDefined(symbol.valueDeclaration, "should always have a declaration")) ? getTypeOfSymbol(classSymbol) : getDeclaredTypeOfSymbol(classSymbol);
       return getNarrowedType(
         type,
         targetType,
@@ -74564,17 +74636,18 @@ function createTypeChecker(host) {
     const antecedent = expr.flowNode || expr.parent.kind === 253 /* ReturnStatement */ && expr.parent.flowNode || { flags: 2 /* Start */ };
     const trueCondition = {
       flags: 32 /* TrueCondition */,
-      node: expr,
-      antecedent
+      antecedent,
+      node: expr
     };
     const trueType2 = getFlowTypeOfReference(param.name, initType, initType, func, trueCondition);
     if (trueType2 === initType)
       return void 0;
     const falseCondition = {
-      ...trueCondition,
-      flags: 64 /* FalseCondition */
+      flags: 64 /* FalseCondition */,
+      antecedent,
+      node: expr
     };
-    const falseSubtype = getFlowTypeOfReference(param.name, trueType2, trueType2, func, falseCondition);
+    const falseSubtype = getFlowTypeOfReference(param.name, initType, trueType2, func, falseCondition);
     return falseSubtype.flags & 131072 /* Never */ ? trueType2 : void 0;
   }
   function checkAllCodePathsInNonVoidFunctionReturnOrThrow(func, returnType) {
@@ -75967,7 +76040,7 @@ function createTypeChecker(host) {
     ) || unknownType, isTemplateLiteralContextualType)) {
       return getTemplateLiteralType(texts, types);
     }
-    const evaluated = node.parent.kind !== 215 /* TaggedTemplateExpression */ && evaluate(node);
+    const evaluated = node.parent.kind !== 215 /* TaggedTemplateExpression */ && evaluate(node).value;
     return evaluated ? getFreshTypeOfLiteralType(getStringLiteralType(evaluated)) : stringType;
   }
   function isTemplateLiteralContextualType(type) {
@@ -80872,14 +80945,14 @@ function createTypeChecker(host) {
       let autoValue = 0;
       let previous;
       for (const member of node.members) {
-        const value = computeMemberValue(member, autoValue, previous);
-        getNodeLinks(member).enumMemberValue = value;
-        autoValue = typeof value === "number" ? value + 1 : void 0;
+        const result = computeEnumMemberValue(member, autoValue, previous);
+        getNodeLinks(member).enumMemberValue = result;
+        autoValue = typeof result.value === "number" ? result.value + 1 : void 0;
         previous = member;
       }
     }
   }
-  function computeMemberValue(member, autoValue, previous) {
+  function computeEnumMemberValue(member, autoValue, previous) {
     if (isComputedNonLiteralName(member.name)) {
       error(member.name, Diagnostics.Computed_property_names_are_not_allowed_in_enums);
     } else {
@@ -80889,34 +80962,43 @@ function createTypeChecker(host) {
       }
     }
     if (member.initializer) {
-      return computeConstantValue(member);
+      return computeConstantEnumMemberValue(member);
     }
     if (member.parent.flags & 33554432 /* Ambient */ && !isEnumConst(member.parent)) {
-      return void 0;
+      return evaluatorResult(
+        /*value*/
+        void 0
+      );
     }
     if (autoValue === void 0) {
       error(member.name, Diagnostics.Enum_member_must_have_initializer);
-      return void 0;
-    }
-    if (getIsolatedModules(compilerOptions) && (previous == null ? void 0 : previous.initializer) && !isSyntacticallyNumericConstant(previous.initializer)) {
-      error(
-        member.name,
-        Diagnostics.Enum_member_following_a_non_literal_numeric_member_must_have_an_initializer_when_isolatedModules_is_enabled
+      return evaluatorResult(
+        /*value*/
+        void 0
       );
     }
-    return autoValue;
+    if (getIsolatedModules(compilerOptions) && (previous == null ? void 0 : previous.initializer)) {
+      const prevValue = getEnumMemberValue(previous);
+      if (!(typeof prevValue.value === "number" && !prevValue.resolvedOtherFiles)) {
+        error(
+          member.name,
+          Diagnostics.Enum_member_following_a_non_literal_numeric_member_must_have_an_initializer_when_isolatedModules_is_enabled
+        );
+      }
+    }
+    return evaluatorResult(autoValue);
   }
-  function computeConstantValue(member) {
+  function computeConstantEnumMemberValue(member) {
     const isConstEnum = isEnumConst(member.parent);
     const initializer = member.initializer;
-    const value = evaluate(initializer, member);
-    if (value !== void 0) {
-      if (isConstEnum && typeof value === "number" && !isFinite(value)) {
+    const result = evaluate(initializer, member);
+    if (result.value !== void 0) {
+      if (isConstEnum && typeof result.value === "number" && !isFinite(result.value)) {
         error(
           initializer,
-          isNaN(value) ? Diagnostics.const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN : Diagnostics.const_enum_member_initializer_was_evaluated_to_a_non_finite_value
+          isNaN(result.value) ? Diagnostics.const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN : Diagnostics.const_enum_member_initializer_was_evaluated_to_a_non_finite_value
         );
-      } else if (getIsolatedModules(compilerOptions) && typeof value === "string" && !isSyntacticallyString(initializer)) {
+      } else if (getIsolatedModules(compilerOptions) && typeof result.value === "string" && !result.isSyntacticallyString) {
         error(
           initializer,
           Diagnostics._0_has_a_string_type_but_must_have_syntactically_recognizable_string_syntax_when_isolatedModules_is_enabled,
@@ -80930,19 +81012,7 @@ function createTypeChecker(host) {
     } else {
       checkTypeAssignableTo(checkExpression(initializer), numberType, initializer, Diagnostics.Type_0_is_not_assignable_to_type_1_as_required_for_computed_enum_member_values);
     }
-    return value;
-  }
-  function isSyntacticallyNumericConstant(expr) {
-    expr = skipOuterExpressions(expr);
-    switch (expr.kind) {
-      case 224 /* PrefixUnaryExpression */:
-        return isSyntacticallyNumericConstant(expr.operand);
-      case 226 /* BinaryExpression */:
-        return isSyntacticallyNumericConstant(expr.left) && isSyntacticallyNumericConstant(expr.right);
-      case 9 /* NumericLiteral */:
-        return true;
-    }
-    return false;
+    return result;
   }
   function evaluateEntityNameExpression(expr, location) {
     const symbol = resolveEntityName(
@@ -80952,7 +81022,10 @@ function createTypeChecker(host) {
       true
     );
     if (!symbol)
-      return void 0;
+      return evaluatorResult(
+        /*value*/
+        void 0
+      );
     if (expr.kind === 80 /* Identifier */) {
       const identifier = expr;
       if (isInfinityOrNaNString(identifier.escapedText) && symbol === getGlobalSymbol(
@@ -80961,7 +81034,11 @@ function createTypeChecker(host) {
         /*diagnostic*/
         void 0
       )) {
-        return +identifier.escapedText;
+        return evaluatorResult(
+          +identifier.escapedText,
+          /*isSyntacticallyString*/
+          false
+        );
       }
     }
     if (symbol.flags & 8 /* EnumMember */) {
@@ -80970,9 +81047,23 @@ function createTypeChecker(host) {
     if (isConstantVariable(symbol)) {
       const declaration = symbol.valueDeclaration;
       if (declaration && isVariableDeclaration(declaration) && !declaration.type && declaration.initializer && (!location || declaration !== location && isBlockScopedNameDeclaredBeforeUse(declaration, location))) {
-        return evaluate(declaration.initializer, declaration);
+        const result = evaluate(declaration.initializer, declaration);
+        if (location && getSourceFileOfNode(location) !== getSourceFileOfNode(declaration)) {
+          return evaluatorResult(
+            result.value,
+            /*isSyntacticallyString*/
+            false,
+            /*resolvedOtherFiles*/
+            true
+          );
+        }
+        return result;
       }
     }
+    return evaluatorResult(
+      /*value*/
+      void 0
+    );
   }
   function evaluateElementAccessExpression(expr, location) {
     const root = expr.expression;
@@ -80987,20 +81078,31 @@ function createTypeChecker(host) {
         const name = escapeLeadingUnderscores(expr.argumentExpression.text);
         const member = rootSymbol.exports.get(name);
         if (member) {
+          Debug.assert(getSourceFileOfNode(member.valueDeclaration) === getSourceFileOfNode(rootSymbol.valueDeclaration));
           return location ? evaluateEnumMember(expr, member, location) : getEnumMemberValue(member.valueDeclaration);
         }
       }
     }
+    return evaluatorResult(
+      /*value*/
+      void 0
+    );
   }
   function evaluateEnumMember(expr, symbol, location) {
     const declaration = symbol.valueDeclaration;
     if (!declaration || declaration === location) {
       error(expr, Diagnostics.Property_0_is_used_before_being_assigned, symbolToString(symbol));
-      return void 0;
+      return evaluatorResult(
+        /*value*/
+        void 0
+      );
     }
     if (!isBlockScopedNameDeclaredBeforeUse(declaration, location)) {
       error(expr, Diagnostics.A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums);
-      return 0;
+      return evaluatorResult(
+        /*value*/
+        0
+      );
     }
     return getEnumMemberValue(declaration);
   }
@@ -83141,7 +83243,10 @@ function createTypeChecker(host) {
   }
   function getEnumMemberValue(node) {
     computeEnumMemberValues(node.parent);
-    return getNodeLinks(node).enumMemberValue;
+    return getNodeLinks(node).enumMemberValue ?? evaluatorResult(
+      /*value*/
+      void 0
+    );
   }
   function canHaveConstantValue(node) {
     switch (node.kind) {
@@ -83154,13 +83259,13 @@ function createTypeChecker(host) {
   }
   function getConstantValue2(node) {
     if (node.kind === 306 /* EnumMember */) {
-      return getEnumMemberValue(node);
+      return getEnumMemberValue(node).value;
     }
     const symbol = getNodeLinks(node).resolvedSymbol;
     if (symbol && symbol.flags & 8 /* EnumMember */) {
       const member = symbol.valueDeclaration;
       if (isEnumConst(member.parent)) {
-        return getEnumMemberValue(member);
+        return getEnumMemberValue(member).value;
       }
     }
     return void 0;
@@ -83535,6 +83640,10 @@ function createTypeChecker(host) {
         const node = getParseTreeNode(nodeIn, canHaveConstantValue);
         return node ? getConstantValue2(node) : void 0;
       },
+      getEnumMemberValue: (nodeIn) => {
+        const node = getParseTreeNode(nodeIn, isEnumMember);
+        return node ? getEnumMemberValue(node) : void 0;
+      },
       collectLinkedAliases,
       getReferencedValueDeclaration,
       getReferencedValueDeclarations,
@@ -89753,7 +89862,8 @@ function transformTypeScript(context) {
       /*generateNameForComputedPropertyName*/
       false
     );
-    const valueExpression = transformEnumMemberDeclarationValue(member);
+    const evaluated = resolver.getEnumMemberValue(member);
+    const valueExpression = transformEnumMemberDeclarationValue(member, evaluated == null ? void 0 : evaluated.value);
     const innerAssignment = factory2.createAssignment(
       factory2.createElementAccessExpression(
         currentNamespaceContainerName,
@@ -89761,7 +89871,7 @@ function transformTypeScript(context) {
       ),
       valueExpression
     );
-    const outerAssignment = isSyntacticallyString(valueExpression) ? innerAssignment : factory2.createAssignment(
+    const outerAssignment = typeof (evaluated == null ? void 0 : evaluated.value) === "string" || (evaluated == null ? void 0 : evaluated.isSyntacticallyString) ? innerAssignment : factory2.createAssignment(
       factory2.createElementAccessExpression(
         currentNamespaceContainerName,
         innerAssignment
@@ -89778,10 +89888,9 @@ function transformTypeScript(context) {
       member
     );
   }
-  function transformEnumMemberDeclarationValue(member) {
-    const value = resolver.getConstantValue(member);
-    if (value !== void 0) {
-      return typeof value === "string" ? factory2.createStringLiteral(value) : value < 0 ? factory2.createPrefixUnaryExpression(41 /* MinusToken */, factory2.createNumericLiteral(-value)) : factory2.createNumericLiteral(value);
+  function transformEnumMemberDeclarationValue(member, constantValue) {
+    if (constantValue !== void 0) {
+      return typeof constantValue === "string" ? factory2.createStringLiteral(constantValue) : constantValue < 0 ? factory2.createPrefixUnaryExpression(41 /* MinusToken */, factory2.createNumericLiteral(-constantValue)) : factory2.createNumericLiteral(constantValue);
     } else {
       enableSubstitutionForNonQualifiedEnumMembers();
       if (member.initializer) {
@@ -111121,6 +111230,7 @@ var notImplementedResolver = {
   isEntityNameVisible: notImplemented,
   // Returns the constant value this property access resolves to: notImplemented, or 'undefined' for a non-constant
   getConstantValue: notImplemented,
+  getEnumMemberValue: notImplemented,
   getReferencedValueDeclaration: notImplemented,
   getReferencedValueDeclarations: notImplemented,
   getTypeReferenceSerializationKind: notImplemented,