typescript 5.4.0-dev.20231106 → 5.4.0-dev.20231107

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20231106`;
+var version = `${versionMajorMinor}.0-dev.20231107`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -47697,7 +47697,7 @@ function createTypeChecker(host) {
     return symbol && !!symbol.valueDeclaration && isExpression(symbol.valueDeclaration) && !isContextSensitive(symbol.valueDeclaration);
   }
   function toNodeBuilderFlags(flags = 0 /* None */) {
-    return flags & 848330091 /* NodeBuilderFlagsMask */;
+    return flags & 848330095 /* NodeBuilderFlagsMask */;
   }
   function isClassInstanceSide(type) {
     return !!type.symbol && !!(type.symbol.flags & 32 /* Class */) && (type === getDeclaredTypeOfClassOrInterface(type.symbol) || !!(type.flags & 524288 /* Object */) && !!(getObjectFlags(type) & 16777216 /* IsClassInstanceClone */));
@@ -47946,7 +47946,7 @@ function createTypeChecker(host) {
           }
           return factory.createInferTypeNode(typeParameterToDeclarationWithConstraint(type, context, constraintNode));
         }
-        if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */ && type.flags & 262144 /* TypeParameter */ && !isTypeSymbolAccessible(type.symbol, context.enclosingDeclaration)) {
+        if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */ && type.flags & 262144 /* TypeParameter */) {
           const name2 = typeParameterToName(type, context);
           context.approximateLength += idText(name2).length;
           return factory.createTypeReferenceNode(
@@ -48746,36 +48746,65 @@ function createTypeChecker(host) {
         true
       )[0];
       let cleanup;
-      if (context.enclosingDeclaration && signature.declaration && signature.declaration !== context.enclosingDeclaration && !isInJSFile(signature.declaration) && some(expandedParams)) {
-        const existingFakeScope = getNodeLinks(context.enclosingDeclaration).fakeScopeForSignatureDeclaration ? context.enclosingDeclaration : void 0;
-        Debug.assertOptionalNode(existingFakeScope, isBlock);
-        const locals = (existingFakeScope == null ? void 0 : existingFakeScope.locals) ?? createSymbolTable();
-        let newLocals;
-        for (const param of expandedParams) {
-          if (!locals.has(param.escapedName)) {
-            newLocals = append(newLocals, param.escapedName);
-            locals.set(param.escapedName, param);
-          }
-        }
-        if (newLocals) {
-          let removeNewLocals2 = function() {
+      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));
-          };
-          var removeNewLocals = removeNewLocals2;
+            oldCleanup == null ? void 0 : oldCleanup();
+          }
           if (existingFakeScope) {
-            cleanup = removeNewLocals2;
+            cleanup = undo;
           } else {
             const fakeScope = parseNodeFactory.createBlock(emptyArray);
-            getNodeLinks(fakeScope).fakeScopeForSignatureDeclaration = true;
+            getNodeLinks(fakeScope).fakeScopeForSignatureDeclaration = kind2;
             fakeScope.locals = locals;
             const saveEnclosingDeclaration = context.enclosingDeclaration;
             setParent(fakeScope, saveEnclosingDeclaration);
             context.enclosingDeclaration = fakeScope;
             cleanup = () => {
               context.enclosingDeclaration = saveEnclosingDeclaration;
-              removeNewLocals2();
+              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 parameters = (some(expandedParams, (p) => p !== expandedParams[expandedParams.length - 1] && !!(getCheckFlags(p) & 32768 /* RestParameter */)) ? signature.parameters : expandedParams).map((parameter) => symbolToParameterDeclaration(parameter, context, kind === 176 /* Constructor */, options == null ? void 0 : options.privateSymbolVisitor, options == null ? void 0 : options.bundledImports));
@@ -49320,7 +49349,7 @@ function createTypeChecker(host) {
         return identifier;
       }
     }
-    function typeParameterShadowsNameInScope(escapedName, context, type) {
+    function typeParameterShadowsOtherTypeParameterInScope(escapedName, context, type) {
       const result = resolveName(
         context.enclosingDeclaration,
         escapedName,
@@ -49331,11 +49360,8 @@ function createTypeChecker(host) {
         /*isUse*/
         false
       );
-      if (result) {
-        if (result.flags & 262144 /* TypeParameter */ && result === type.symbol) {
-          return false;
-        }
-        return true;
+      if (result && result.flags & 262144 /* TypeParameter */) {
+        return result !== type.symbol;
       }
       return false;
     }
@@ -49361,7 +49387,7 @@ function createTypeChecker(host) {
         const rawtext = result.escapedText;
         let i = ((_a = context.typeParameterNamesByTextNextNameCount) == null ? void 0 : _a.get(rawtext)) || 0;
         let text = rawtext;
-        while (((_b = context.typeParameterNamesByText) == null ? void 0 : _b.has(text)) || typeParameterShadowsNameInScope(text, context, type)) {
+        while (((_b = context.typeParameterNamesByText) == null ? void 0 : _b.has(text)) || typeParameterShadowsOtherTypeParameterInScope(text, context, type)) {
           i++;
           text = `${rawtext}_${i}`;
         }
@@ -49372,7 +49398,7 @@ function createTypeChecker(host) {
         }
         (context.typeParameterNamesByTextNextNameCount || (context.typeParameterNamesByTextNextNameCount = /* @__PURE__ */ new Map())).set(rawtext, i);
         (context.typeParameterNames || (context.typeParameterNames = /* @__PURE__ */ new Map())).set(getTypeId(type), result);
-        (context.typeParameterNamesByText || (context.typeParameterNamesByText = /* @__PURE__ */ new Set())).add(rawtext);
+        (context.typeParameterNamesByText || (context.typeParameterNamesByText = /* @__PURE__ */ new Set())).add(text);
       }
       return result;
     }
@@ -49517,7 +49543,10 @@ function createTypeChecker(host) {
       return !(getObjectFlags(type) & 4 /* Reference */) || !isTypeReferenceNode(existing) || length(existing.typeArguments) >= getMinTypeArgumentCount(type.target.typeParameters);
     }
     function getEnclosingDeclarationIgnoringFakeScope(enclosingDeclaration) {
-      return getNodeLinks(enclosingDeclaration).fakeScopeForSignatureDeclaration ? enclosingDeclaration.parent : enclosingDeclaration;
+      while (getNodeLinks(enclosingDeclaration).fakeScopeForSignatureDeclaration) {
+        enclosingDeclaration = enclosingDeclaration.parent;
+      }
+      return enclosingDeclaration;
     }
     function serializeTypeForDeclaration(context, type, symbol, enclosingDeclaration, includePrivateSymbol, bundled) {
       if (!isErrorType(type) && enclosingDeclaration) {
@@ -49597,7 +49626,7 @@ function createTypeChecker(host) {
         }
         if (isIdentifier(node)) {
           const type = getDeclaredTypeOfSymbol(sym);
-          const name = sym.flags & 262144 /* TypeParameter */ && !isTypeSymbolAccessible(type.symbol, context.enclosingDeclaration) ? typeParameterToName(type, context) : factory.cloneNode(node);
+          const name = sym.flags & 262144 /* TypeParameter */ ? typeParameterToName(type, context) : factory.cloneNode(node);
           name.symbol = sym;
           return { introducesError, node: setEmitFlags(setOriginalNode(name, node), 16777216 /* NoAsciiEscaping */) };
         }
@@ -66528,6 +66557,9 @@ function createTypeChecker(host) {
     }
     function getNarrowedTypeWorker(type, candidate, assumeTrue, checkDerived) {
       if (!assumeTrue) {
+        if (type === candidate) {
+          return neverType;
+        }
         if (checkDerived) {
           return filterType(type, (t) => !isTypeDerivedFrom(t, candidate));
         }
@@ -66544,6 +66576,9 @@ function createTypeChecker(host) {
       if (type.flags & 3 /* AnyOrUnknown */) {
         return candidate;
       }
+      if (type === candidate) {
+        return candidate;
+      }
       const isRelated = checkDerived ? isTypeDerivedFrom : isTypeSubtypeOf;
       const keyPropertyName = type.flags & 1048576 /* Union */ ? getKeyPropertyName(type) : void 0;
       const narrowedType = mapType(candidate, (c) => {

package/lib/tsserver.js

@@ -2330,7 +2330,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20231106`;
+var version = `${versionMajorMinor}.0-dev.20231107`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -6402,6 +6402,7 @@ var TypeFormatFlags = /* @__PURE__ */ ((TypeFormatFlags2) => {
   TypeFormatFlags2[TypeFormatFlags2["None"] = 0] = "None";
   TypeFormatFlags2[TypeFormatFlags2["NoTruncation"] = 1] = "NoTruncation";
   TypeFormatFlags2[TypeFormatFlags2["WriteArrayAsGenericType"] = 2] = "WriteArrayAsGenericType";
+  TypeFormatFlags2[TypeFormatFlags2["GenerateNamesForShadowedTypeParams"] = 4] = "GenerateNamesForShadowedTypeParams";
   TypeFormatFlags2[TypeFormatFlags2["UseStructuralFallback"] = 8] = "UseStructuralFallback";
   TypeFormatFlags2[TypeFormatFlags2["WriteTypeArgumentsOfSignature"] = 32] = "WriteTypeArgumentsOfSignature";
   TypeFormatFlags2[TypeFormatFlags2["UseFullyQualifiedType"] = 64] = "UseFullyQualifiedType";
@@ -6421,7 +6422,7 @@ var TypeFormatFlags = /* @__PURE__ */ ((TypeFormatFlags2) => {
   TypeFormatFlags2[TypeFormatFlags2["InElementType"] = 2097152] = "InElementType";
   TypeFormatFlags2[TypeFormatFlags2["InFirstTypeArgument"] = 4194304] = "InFirstTypeArgument";
   TypeFormatFlags2[TypeFormatFlags2["InTypeAlias"] = 8388608] = "InTypeAlias";
-  TypeFormatFlags2[TypeFormatFlags2["NodeBuilderFlagsMask"] = 848330091] = "NodeBuilderFlagsMask";
+  TypeFormatFlags2[TypeFormatFlags2["NodeBuilderFlagsMask"] = 848330095] = "NodeBuilderFlagsMask";
   return TypeFormatFlags2;
 })(TypeFormatFlags || {});
 var SymbolFormatFlags = /* @__PURE__ */ ((SymbolFormatFlags2) => {
@@ -52403,7 +52404,7 @@ function createTypeChecker(host) {
     return symbol && !!symbol.valueDeclaration && isExpression(symbol.valueDeclaration) && !isContextSensitive(symbol.valueDeclaration);
   }
   function toNodeBuilderFlags(flags = 0 /* None */) {
-    return flags & 848330091 /* NodeBuilderFlagsMask */;
+    return flags & 848330095 /* NodeBuilderFlagsMask */;
   }
   function isClassInstanceSide(type) {
     return !!type.symbol && !!(type.symbol.flags & 32 /* Class */) && (type === getDeclaredTypeOfClassOrInterface(type.symbol) || !!(type.flags & 524288 /* Object */) && !!(getObjectFlags(type) & 16777216 /* IsClassInstanceClone */));
@@ -52652,7 +52653,7 @@ function createTypeChecker(host) {
           }
           return factory.createInferTypeNode(typeParameterToDeclarationWithConstraint(type, context, constraintNode));
         }
-        if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */ && type.flags & 262144 /* TypeParameter */ && !isTypeSymbolAccessible(type.symbol, context.enclosingDeclaration)) {
+        if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */ && type.flags & 262144 /* TypeParameter */) {
           const name2 = typeParameterToName(type, context);
           context.approximateLength += idText(name2).length;
           return factory.createTypeReferenceNode(
@@ -53452,36 +53453,65 @@ function createTypeChecker(host) {
         true
       )[0];
       let cleanup;
-      if (context.enclosingDeclaration && signature.declaration && signature.declaration !== context.enclosingDeclaration && !isInJSFile(signature.declaration) && some(expandedParams)) {
-        const existingFakeScope = getNodeLinks(context.enclosingDeclaration).fakeScopeForSignatureDeclaration ? context.enclosingDeclaration : void 0;
-        Debug.assertOptionalNode(existingFakeScope, isBlock);
-        const locals = (existingFakeScope == null ? void 0 : existingFakeScope.locals) ?? createSymbolTable();
-        let newLocals;
-        for (const param of expandedParams) {
-          if (!locals.has(param.escapedName)) {
-            newLocals = append(newLocals, param.escapedName);
-            locals.set(param.escapedName, param);
-          }
-        }
-        if (newLocals) {
-          let removeNewLocals2 = function() {
+      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));
-          };
-          var removeNewLocals = removeNewLocals2;
+            oldCleanup == null ? void 0 : oldCleanup();
+          }
           if (existingFakeScope) {
-            cleanup = removeNewLocals2;
+            cleanup = undo;
           } else {
             const fakeScope = parseNodeFactory.createBlock(emptyArray);
-            getNodeLinks(fakeScope).fakeScopeForSignatureDeclaration = true;
+            getNodeLinks(fakeScope).fakeScopeForSignatureDeclaration = kind2;
             fakeScope.locals = locals;
             const saveEnclosingDeclaration = context.enclosingDeclaration;
             setParent(fakeScope, saveEnclosingDeclaration);
             context.enclosingDeclaration = fakeScope;
             cleanup = () => {
               context.enclosingDeclaration = saveEnclosingDeclaration;
-              removeNewLocals2();
+              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 parameters = (some(expandedParams, (p) => p !== expandedParams[expandedParams.length - 1] && !!(getCheckFlags(p) & 32768 /* RestParameter */)) ? signature.parameters : expandedParams).map((parameter) => symbolToParameterDeclaration(parameter, context, kind === 176 /* Constructor */, options == null ? void 0 : options.privateSymbolVisitor, options == null ? void 0 : options.bundledImports));
@@ -54026,7 +54056,7 @@ function createTypeChecker(host) {
         return identifier;
       }
     }
-    function typeParameterShadowsNameInScope(escapedName, context, type) {
+    function typeParameterShadowsOtherTypeParameterInScope(escapedName, context, type) {
       const result = resolveName(
         context.enclosingDeclaration,
         escapedName,
@@ -54037,11 +54067,8 @@ function createTypeChecker(host) {
         /*isUse*/
         false
       );
-      if (result) {
-        if (result.flags & 262144 /* TypeParameter */ && result === type.symbol) {
-          return false;
-        }
-        return true;
+      if (result && result.flags & 262144 /* TypeParameter */) {
+        return result !== type.symbol;
       }
       return false;
     }
@@ -54067,7 +54094,7 @@ function createTypeChecker(host) {
         const rawtext = result.escapedText;
         let i = ((_a = context.typeParameterNamesByTextNextNameCount) == null ? void 0 : _a.get(rawtext)) || 0;
         let text = rawtext;
-        while (((_b = context.typeParameterNamesByText) == null ? void 0 : _b.has(text)) || typeParameterShadowsNameInScope(text, context, type)) {
+        while (((_b = context.typeParameterNamesByText) == null ? void 0 : _b.has(text)) || typeParameterShadowsOtherTypeParameterInScope(text, context, type)) {
           i++;
           text = `${rawtext}_${i}`;
         }
@@ -54078,7 +54105,7 @@ function createTypeChecker(host) {
         }
         (context.typeParameterNamesByTextNextNameCount || (context.typeParameterNamesByTextNextNameCount = /* @__PURE__ */ new Map())).set(rawtext, i);
         (context.typeParameterNames || (context.typeParameterNames = /* @__PURE__ */ new Map())).set(getTypeId(type), result);
-        (context.typeParameterNamesByText || (context.typeParameterNamesByText = /* @__PURE__ */ new Set())).add(rawtext);
+        (context.typeParameterNamesByText || (context.typeParameterNamesByText = /* @__PURE__ */ new Set())).add(text);
       }
       return result;
     }
@@ -54223,7 +54250,10 @@ function createTypeChecker(host) {
       return !(getObjectFlags(type) & 4 /* Reference */) || !isTypeReferenceNode(existing) || length(existing.typeArguments) >= getMinTypeArgumentCount(type.target.typeParameters);
     }
     function getEnclosingDeclarationIgnoringFakeScope(enclosingDeclaration) {
-      return getNodeLinks(enclosingDeclaration).fakeScopeForSignatureDeclaration ? enclosingDeclaration.parent : enclosingDeclaration;
+      while (getNodeLinks(enclosingDeclaration).fakeScopeForSignatureDeclaration) {
+        enclosingDeclaration = enclosingDeclaration.parent;
+      }
+      return enclosingDeclaration;
     }
     function serializeTypeForDeclaration(context, type, symbol, enclosingDeclaration, includePrivateSymbol, bundled) {
       if (!isErrorType(type) && enclosingDeclaration) {
@@ -54303,7 +54333,7 @@ function createTypeChecker(host) {
         }
         if (isIdentifier(node)) {
           const type = getDeclaredTypeOfSymbol(sym);
-          const name = sym.flags & 262144 /* TypeParameter */ && !isTypeSymbolAccessible(type.symbol, context.enclosingDeclaration) ? typeParameterToName(type, context) : factory.cloneNode(node);
+          const name = sym.flags & 262144 /* TypeParameter */ ? typeParameterToName(type, context) : factory.cloneNode(node);
           name.symbol = sym;
           return { introducesError, node: setEmitFlags(setOriginalNode(name, node), 16777216 /* NoAsciiEscaping */) };
         }
@@ -71234,6 +71264,9 @@ function createTypeChecker(host) {
     }
     function getNarrowedTypeWorker(type, candidate, assumeTrue, checkDerived) {
       if (!assumeTrue) {
+        if (type === candidate) {
+          return neverType;
+        }
         if (checkDerived) {
           return filterType(type, (t) => !isTypeDerivedFrom(t, candidate));
         }
@@ -71250,6 +71283,9 @@ function createTypeChecker(host) {
       if (type.flags & 3 /* AnyOrUnknown */) {
         return candidate;
       }
+      if (type === candidate) {
+        return candidate;
+      }
       const isRelated = checkDerived ? isTypeDerivedFrom : isTypeSubtypeOf;
       const keyPropertyName = type.flags & 1048576 /* Union */ ? getKeyPropertyName(type) : void 0;
       const narrowedType = mapType(candidate, (c) => {

package/lib/typescript.d.ts

@@ -6887,6 +6887,7 @@ declare namespace ts {
         None = 0,
         NoTruncation = 1,
         WriteArrayAsGenericType = 2,
+        GenerateNamesForShadowedTypeParams = 4,
         UseStructuralFallback = 8,
         WriteTypeArgumentsOfSignature = 32,
         UseFullyQualifiedType = 64,
@@ -6906,7 +6907,7 @@ declare namespace ts {
         InElementType = 2097152,
         InFirstTypeArgument = 4194304,
         InTypeAlias = 8388608,
-        NodeBuilderFlagsMask = 848330091,
+        NodeBuilderFlagsMask = 848330095,
     }
     enum SymbolFormatFlags {
         None = 0,

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.4";
-      version = `${versionMajorMinor}.0-dev.20231106`;
+      version = `${versionMajorMinor}.0-dev.20231107`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -4165,6 +4165,7 @@ ${lanes.join("\n")}
         TypeFormatFlags2[TypeFormatFlags2["None"] = 0] = "None";
         TypeFormatFlags2[TypeFormatFlags2["NoTruncation"] = 1] = "NoTruncation";
         TypeFormatFlags2[TypeFormatFlags2["WriteArrayAsGenericType"] = 2] = "WriteArrayAsGenericType";
+        TypeFormatFlags2[TypeFormatFlags2["GenerateNamesForShadowedTypeParams"] = 4] = "GenerateNamesForShadowedTypeParams";
         TypeFormatFlags2[TypeFormatFlags2["UseStructuralFallback"] = 8] = "UseStructuralFallback";
         TypeFormatFlags2[TypeFormatFlags2["WriteTypeArgumentsOfSignature"] = 32] = "WriteTypeArgumentsOfSignature";
         TypeFormatFlags2[TypeFormatFlags2["UseFullyQualifiedType"] = 64] = "UseFullyQualifiedType";
@@ -4184,7 +4185,7 @@ ${lanes.join("\n")}
         TypeFormatFlags2[TypeFormatFlags2["InElementType"] = 2097152] = "InElementType";
         TypeFormatFlags2[TypeFormatFlags2["InFirstTypeArgument"] = 4194304] = "InFirstTypeArgument";
         TypeFormatFlags2[TypeFormatFlags2["InTypeAlias"] = 8388608] = "InTypeAlias";
-        TypeFormatFlags2[TypeFormatFlags2["NodeBuilderFlagsMask"] = 848330091] = "NodeBuilderFlagsMask";
+        TypeFormatFlags2[TypeFormatFlags2["NodeBuilderFlagsMask"] = 848330095] = "NodeBuilderFlagsMask";
         return TypeFormatFlags2;
       })(TypeFormatFlags || {});
       SymbolFormatFlags = /* @__PURE__ */ ((SymbolFormatFlags2) => {
@@ -50168,7 +50169,7 @@ ${lanes.join("\n")}
       return symbol && !!symbol.valueDeclaration && isExpression(symbol.valueDeclaration) && !isContextSensitive(symbol.valueDeclaration);
     }
     function toNodeBuilderFlags(flags = 0 /* None */) {
-      return flags & 848330091 /* NodeBuilderFlagsMask */;
+      return flags & 848330095 /* NodeBuilderFlagsMask */;
     }
     function isClassInstanceSide(type) {
       return !!type.symbol && !!(type.symbol.flags & 32 /* Class */) && (type === getDeclaredTypeOfClassOrInterface(type.symbol) || !!(type.flags & 524288 /* Object */) && !!(getObjectFlags(type) & 16777216 /* IsClassInstanceClone */));
@@ -50417,7 +50418,7 @@ ${lanes.join("\n")}
             }
             return factory.createInferTypeNode(typeParameterToDeclarationWithConstraint(type, context, constraintNode));
           }
-          if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */ && type.flags & 262144 /* TypeParameter */ && !isTypeSymbolAccessible(type.symbol, context.enclosingDeclaration)) {
+          if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */ && type.flags & 262144 /* TypeParameter */) {
             const name2 = typeParameterToName(type, context);
             context.approximateLength += idText(name2).length;
             return factory.createTypeReferenceNode(
@@ -51217,36 +51218,65 @@ ${lanes.join("\n")}
           true
         )[0];
         let cleanup;
-        if (context.enclosingDeclaration && signature.declaration && signature.declaration !== context.enclosingDeclaration && !isInJSFile(signature.declaration) && some(expandedParams)) {
-          const existingFakeScope = getNodeLinks(context.enclosingDeclaration).fakeScopeForSignatureDeclaration ? context.enclosingDeclaration : void 0;
-          Debug.assertOptionalNode(existingFakeScope, isBlock);
-          const locals = (existingFakeScope == null ? void 0 : existingFakeScope.locals) ?? createSymbolTable();
-          let newLocals;
-          for (const param of expandedParams) {
-            if (!locals.has(param.escapedName)) {
-              newLocals = append(newLocals, param.escapedName);
-              locals.set(param.escapedName, param);
-            }
-          }
-          if (newLocals) {
-            let removeNewLocals2 = function() {
+        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));
-            };
-            var removeNewLocals = removeNewLocals2;
+              oldCleanup == null ? void 0 : oldCleanup();
+            }
             if (existingFakeScope) {
-              cleanup = removeNewLocals2;
+              cleanup = undo;
             } else {
               const fakeScope = parseNodeFactory.createBlock(emptyArray);
-              getNodeLinks(fakeScope).fakeScopeForSignatureDeclaration = true;
+              getNodeLinks(fakeScope).fakeScopeForSignatureDeclaration = kind2;
               fakeScope.locals = locals;
               const saveEnclosingDeclaration = context.enclosingDeclaration;
               setParent(fakeScope, saveEnclosingDeclaration);
               context.enclosingDeclaration = fakeScope;
               cleanup = () => {
                 context.enclosingDeclaration = saveEnclosingDeclaration;
-                removeNewLocals2();
+                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 parameters = (some(expandedParams, (p) => p !== expandedParams[expandedParams.length - 1] && !!(getCheckFlags(p) & 32768 /* RestParameter */)) ? signature.parameters : expandedParams).map((parameter) => symbolToParameterDeclaration(parameter, context, kind === 176 /* Constructor */, options == null ? void 0 : options.privateSymbolVisitor, options == null ? void 0 : options.bundledImports));
@@ -51791,7 +51821,7 @@ ${lanes.join("\n")}
           return identifier;
         }
       }
-      function typeParameterShadowsNameInScope(escapedName, context, type) {
+      function typeParameterShadowsOtherTypeParameterInScope(escapedName, context, type) {
         const result = resolveName(
           context.enclosingDeclaration,
           escapedName,
@@ -51802,11 +51832,8 @@ ${lanes.join("\n")}
           /*isUse*/
           false
         );
-        if (result) {
-          if (result.flags & 262144 /* TypeParameter */ && result === type.symbol) {
-            return false;
-          }
-          return true;
+        if (result && result.flags & 262144 /* TypeParameter */) {
+          return result !== type.symbol;
         }
         return false;
       }
@@ -51832,7 +51859,7 @@ ${lanes.join("\n")}
           const rawtext = result.escapedText;
           let i = ((_a = context.typeParameterNamesByTextNextNameCount) == null ? void 0 : _a.get(rawtext)) || 0;
           let text = rawtext;
-          while (((_b = context.typeParameterNamesByText) == null ? void 0 : _b.has(text)) || typeParameterShadowsNameInScope(text, context, type)) {
+          while (((_b = context.typeParameterNamesByText) == null ? void 0 : _b.has(text)) || typeParameterShadowsOtherTypeParameterInScope(text, context, type)) {
             i++;
             text = `${rawtext}_${i}`;
           }
@@ -51843,7 +51870,7 @@ ${lanes.join("\n")}
           }
           (context.typeParameterNamesByTextNextNameCount || (context.typeParameterNamesByTextNextNameCount = /* @__PURE__ */ new Map())).set(rawtext, i);
           (context.typeParameterNames || (context.typeParameterNames = /* @__PURE__ */ new Map())).set(getTypeId(type), result);
-          (context.typeParameterNamesByText || (context.typeParameterNamesByText = /* @__PURE__ */ new Set())).add(rawtext);
+          (context.typeParameterNamesByText || (context.typeParameterNamesByText = /* @__PURE__ */ new Set())).add(text);
         }
         return result;
       }
@@ -51988,7 +52015,10 @@ ${lanes.join("\n")}
         return !(getObjectFlags(type) & 4 /* Reference */) || !isTypeReferenceNode(existing) || length(existing.typeArguments) >= getMinTypeArgumentCount(type.target.typeParameters);
       }
       function getEnclosingDeclarationIgnoringFakeScope(enclosingDeclaration) {
-        return getNodeLinks(enclosingDeclaration).fakeScopeForSignatureDeclaration ? enclosingDeclaration.parent : enclosingDeclaration;
+        while (getNodeLinks(enclosingDeclaration).fakeScopeForSignatureDeclaration) {
+          enclosingDeclaration = enclosingDeclaration.parent;
+        }
+        return enclosingDeclaration;
       }
       function serializeTypeForDeclaration(context, type, symbol, enclosingDeclaration, includePrivateSymbol, bundled) {
         if (!isErrorType(type) && enclosingDeclaration) {
@@ -52068,7 +52098,7 @@ ${lanes.join("\n")}
           }
           if (isIdentifier(node)) {
             const type = getDeclaredTypeOfSymbol(sym);
-            const name = sym.flags & 262144 /* TypeParameter */ && !isTypeSymbolAccessible(type.symbol, context.enclosingDeclaration) ? typeParameterToName(type, context) : factory.cloneNode(node);
+            const name = sym.flags & 262144 /* TypeParameter */ ? typeParameterToName(type, context) : factory.cloneNode(node);
             name.symbol = sym;
             return { introducesError, node: setEmitFlags(setOriginalNode(name, node), 16777216 /* NoAsciiEscaping */) };
           }
@@ -68999,6 +69029,9 @@ ${lanes.join("\n")}
       }
       function getNarrowedTypeWorker(type, candidate, assumeTrue, checkDerived) {
         if (!assumeTrue) {
+          if (type === candidate) {
+            return neverType;
+          }
           if (checkDerived) {
             return filterType(type, (t) => !isTypeDerivedFrom(t, candidate));
           }
@@ -69015,6 +69048,9 @@ ${lanes.join("\n")}
         if (type.flags & 3 /* AnyOrUnknown */) {
           return candidate;
         }
+        if (type === candidate) {
+          return candidate;
+        }
         const isRelated = checkDerived ? isTypeDerivedFrom : isTypeSubtypeOf;
         const keyPropertyName = type.flags & 1048576 /* Union */ ? getKeyPropertyName(type) : void 0;
         const narrowedType = mapType(candidate, (c) => {

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20231106`;
+var version = `${versionMajorMinor}.0-dev.20231107`;
 
 // src/compiler/core.ts
 var emptyArray = [];

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.4.0-dev.20231106",
+    "version": "5.4.0-dev.20231107",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -114,5 +114,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "b1ab082c80e4fddc3cfd6d28e66eceb52066f2be"
+    "gitHead": "27556f5d3bc4cd3797efe31d32f45775e2a1ca75"
 }