lambda-live-debugger 1.7.3 → 1.7.4

package/node_modules/fast-xml-parser/package.json

@@ -1,9 +1,10 @@
 {
   "name": "fast-xml-parser",
-  "version": "5.0.9",
+  "version": "5.2.0",
   "description": "Validate XML, Parse XML, Build XML without C/C++ based libraries",
   "main": "./lib/fxp.cjs",
   "type": "module",
+  "sideEffects": false,
   "module": "./src/fxp.js",
   "types": "./src/fxp.d.ts",
   "exports": {

package/node_modules/fast-xml-parser/src/fxp.d.ts

@@ -210,6 +210,12 @@ type X2jOptions = {
    * Defaults to `(tagName, jPath, attrs) => tagName`
    */
   updateTag?: (tagName: string, jPath: string, attrs: {[k: string]: string}) =>  string | boolean;
+
+  /**
+   * If true, adds a Symbol to all object nodes, accessible by {@link XMLParser.getMetaDataSymbol} with
+   * metadata about each the node in the XML file.
+   */
+  captureMetaData?: boolean;
 };
 
 type strnumOptions = {
@@ -407,6 +413,18 @@ export class XMLParser {
    * @param entityValue {string} Eg: '\r'
    */
   addEntity(entityIdentifier: string, entityValue: string): void;
+
+  /**
+   * Returns a Symbol that can be used to access the {@link XMLMetaData}
+   * property on a node.
+   * 
+   * If Symbol is not available in the environment, an ordinary property is used
+   * and the name of the property is here returned.
+   * 
+   * The XMLMetaData property is only present when {@link X2jOptions.captureMetaData}
+   * is true in the options.
+   */
+  static getMetaDataSymbol() : Symbol;
 }
 
 export class XMLValidator{
@@ -414,5 +432,14 @@ export class XMLValidator{
 }
 export class XMLBuilder {
   constructor(options?: XmlBuilderOptions);
-  build(jObj: any): any;
+  build(jObj: any): string;
+}
+
+/**
+ * This object is available on nodes via the symbol {@link XMLParser.getMetaDataSymbol} 
+ * when {@link X2jOptions.captureMetaData} is true.
+ */
+export interface XMLMetaData {
+  /** The index, if available, of the character where the XML node began in the input stream. */
+  startIndex?: number;
 }

package/node_modules/fast-xml-parser/src/xmlparser/OptionsBuilder.js

@@ -38,6 +38,7 @@ export const defaultOptions = {
       return tagName
     },
     // skipEmptyListItem: false
+    captureMetaData: false,
 };
    
 export const buildOptions = function(options) {

package/node_modules/fast-xml-parser/src/xmlparser/OrderedObjParser.js

@@ -246,8 +246,7 @@ const parseXml = function(xmlData) {
           if(tagData.tagName !== tagData.tagExp && tagData.attrExpPresent){
             childNode[":@"] = this.buildAttributesMap(tagData.tagExp, jPath, tagData.tagName);
           }
-          this.addChild(currentNode, childNode, jPath)
-
+          this.addChild(currentNode, childNode, jPath, i);
         }
 
 
@@ -312,6 +311,7 @@ const parseXml = function(xmlData) {
         if(tagName !== xmlObj.tagname){
           jPath += jPath ? "." + tagName : tagName;
         }
+        const startIndex = i;
         if (this.isItStopNode(this.options.stopNodes, jPath, tagName)) {
           let tagContent = "";
           //self-closing tag
@@ -340,6 +340,7 @@ const parseXml = function(xmlData) {
           }
 
           const childNode = new xmlNode(tagName);
+
           if(tagName !== tagExp && attrExpPresent){
             childNode[":@"] = this.buildAttributesMap(tagExp, jPath, tagName);
           }
@@ -350,7 +351,7 @@ const parseXml = function(xmlData) {
           jPath = jPath.substr(0, jPath.lastIndexOf("."));
           childNode.add(this.options.textNodeName, tagContent);
           
-          this.addChild(currentNode, childNode, jPath)
+          this.addChild(currentNode, childNode, jPath, startIndex);
         }else{
   //selfClosing tag
           if(tagExp.length > 0 && tagExp.lastIndexOf("/") === tagExp.length - 1){
@@ -370,7 +371,7 @@ const parseXml = function(xmlData) {
             if(tagName !== tagExp && attrExpPresent){
               childNode[":@"] = this.buildAttributesMap(tagExp, jPath, tagName);
             }
-            this.addChild(currentNode, childNode, jPath)
+            this.addChild(currentNode, childNode, jPath, startIndex);
             jPath = jPath.substr(0, jPath.lastIndexOf("."));
           }
     //opening tag
@@ -381,7 +382,7 @@ const parseXml = function(xmlData) {
             if(tagName !== tagExp && attrExpPresent){
               childNode[":@"] = this.buildAttributesMap(tagExp, jPath, tagName);
             }
-            this.addChild(currentNode, childNode, jPath)
+            this.addChild(currentNode, childNode, jPath, startIndex);
             currentNode = childNode;
           }
           textData = "";
@@ -395,14 +396,16 @@ const parseXml = function(xmlData) {
   return xmlObj.child;
 }
 
-function addChild(currentNode, childNode, jPath){
+function addChild(currentNode, childNode, jPath, startIndex){
+  // unset startIndex if not requested
+  if (!this.options.captureMetaData) startIndex = undefined;
   const result = this.options.updateTag(childNode.tagname, jPath, childNode[":@"])
   if(result === false){
-  }else if(typeof result === "string"){
+  } else if(typeof result === "string"){
     childNode.tagname = result
-    currentNode.addChild(childNode);
+    currentNode.addChild(childNode, startIndex);
   }else{
-    currentNode.addChild(childNode);
+    currentNode.addChild(childNode, startIndex);
   }
 }
 

package/node_modules/fast-xml-parser/src/xmlparser/XMLParser.js

@@ -2,6 +2,7 @@ import { buildOptions} from './OptionsBuilder.js';
 import OrderedObjParser from './OrderedObjParser.js';
 import prettify from './node2json.js';
 import {validate} from "../validator.js";
+import XmlNode from './xmlNode.js';
 
 export default class XMLParser{
     
@@ -53,4 +54,18 @@ export default class XMLParser{
             this.externalEntities[key] = value;
         }
     }
-}
+
+    /**
+     * Returns a Symbol that can be used to access the metadata
+     * property on a node.
+     * 
+     * If Symbol is not available in the environment, an ordinary property is used
+     * and the name of the property is here returned.
+     * 
+     * The XMLMetaData property is only present when `captureMetaData`
+     * is true in the options.
+     */
+    static getMetaDataSymbol() {
+        return XmlNode.getMetaDataSymbol();
+    }
+}

package/node_modules/fast-xml-parser/src/xmlparser/node2json.js

@@ -1,5 +1,9 @@
 'use strict';
 
+import XmlNode from './xmlNode.js';
+
+const METADATA_SYMBOL = XmlNode.getMetaDataSymbol();
+
 /**
  * 
  * @param {array} node 
@@ -36,6 +40,9 @@ function compress(arr, options, jPath){
       
       let val = compress(tagObj[property], options, newJpath);
       const isLeaf = isLeafTag(val, options);
+      if (tagObj[METADATA_SYMBOL] !== undefined) {
+        val[METADATA_SYMBOL] = tagObj[METADATA_SYMBOL]; // copy over metadata
+      }
 
       if(tagObj[":@"]){
         assignAttributes( val, tagObj[":@"], newJpath, options);

package/node_modules/fast-xml-parser/src/xmlparser/xmlNode.js

@@ -1,5 +1,13 @@
 'use strict';
 
+let METADATA_SYMBOL;
+
+if (typeof Symbol !== "function") {
+  METADATA_SYMBOL = "@@xmlMetadata";
+} else {
+  METADATA_SYMBOL = Symbol("XML Node Metadata");
+}
+
 export default class XmlNode{
   constructor(tagname) {
     this.tagname = tagname;
@@ -11,12 +19,22 @@ export default class XmlNode{
     if(key === "__proto__") key = "#__proto__";
     this.child.push( {[key]: val });
   }
-  addChild(node) {
+  addChild(node, startIndex) {
     if(node.tagname === "__proto__") node.tagname = "#__proto__";
     if(node[":@"] && Object.keys(node[":@"]).length > 0){
       this.child.push( { [node.tagname]: node.child, [":@"]: node[":@"] });
     }else{
       this.child.push( { [node.tagname]: node.child });
     }
+    // if requested, add the startIndex
+    if (startIndex !== undefined) {
+      // Note: for now we just overwrite the metadata. If we had more complex metadata,
+      // we might need to do an object append here:  metadata = { ...metadata, startIndex }
+      this.child[this.child.length - 1][METADATA_SYMBOL] = { startIndex };
+    }
+  }
+  /** symbol used for metadata */
+  static getMetaDataSymbol() {
+    return METADATA_SYMBOL;
   }
 }

package/node_modules/inquirer/README.md

@@ -10,6 +10,16 @@ A collection of common interactive command line user interfaces.
 > [!IMPORTANT]
 > This is the legacy version of Inquirer.js. While it still receives maintenance, it is not actively developed. For the new Inquirer, see [@inquirer/prompts](https://www.npmjs.com/package/@inquirer/prompts).
 
+# Special Thanks
+
+<div align="center" markdown="1">
+
+[![Graphite](https://github.com/user-attachments/assets/53db40ca-2254-481a-a094-6597f8716e29)](https://graphite.dev/?utm_source=npmjs&utm_medium=repo&utm_campaign=inquirerjs)<br>
+
+### [Graphite is the AI developer productivity platform helping teams on GitHub ship higher quality software, faster](https://graphite.dev/?utm_source=npmjs&utm_medium=repo&utm_campaign=inquirerjs)
+
+</div>
+
 ## Table of Contents
 
 1.  [Documentation](#documentation)

package/node_modules/inquirer/dist/commonjs/index.d.ts

@@ -4,11 +4,11 @@
  */
 import { Separator } from '@inquirer/prompts';
 import type { Prettify } from '@inquirer/type';
-import PromptsRunner from './ui/prompt.js';
-import type { LegacyPromptConstructor, PromptFn } from './ui/prompt.js';
-import type { Answers, CustomQuestion, UnnamedDistinctQuestion, StreamOptions } from './types.js';
+import PromptsRunner from './ui/prompt.ts';
+import type { LegacyPromptConstructor, PromptFn } from './ui/prompt.ts';
+import type { Answers, CustomQuestion, UnnamedDistinctQuestion, StreamOptions } from './types.ts';
 import { Observable } from 'rxjs';
-export type { QuestionMap, Question, DistinctQuestion, Answers, PromptSession, } from './types.js';
+export type { QuestionMap, Question, DistinctQuestion, Answers, PromptSession, } from './types.ts';
 type PromptReturnType<T> = Promise<Prettify<T>> & {
     ui: PromptsRunner<Prettify<T>>;
 };

package/node_modules/inquirer/dist/commonjs/index.js

@@ -9,7 +9,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPromptModule = createPromptModule;
 const prompts_1 = require("@inquirer/prompts");
-const prompt_js_1 = __importDefault(require("./ui/prompt.js"));
+const prompt_ts_1 = __importDefault(require("./ui/prompt.js"));
 const builtInPrompts = {
     input: prompts_1.input,
     select: prompts_1.select,
@@ -29,7 +29,7 @@ const builtInPrompts = {
  */
 function createPromptModule(opt) {
     function promptModule(questions, answers) {
-        const runner = new prompt_js_1.default(promptModule.prompts, opt);
+        const runner = new prompt_ts_1.default(promptModule.prompts, opt);
         const promptPromise = runner.run(questions, answers);
         return Object.assign(promptPromise, { ui: runner });
     }
@@ -63,7 +63,7 @@ function restoreDefaultPrompts() {
 const inquirer = {
     prompt,
     ui: {
-        Prompt: prompt_js_1.default,
+        Prompt: prompt_ts_1.default,
     },
     createPromptModule,
     registerPrompt,

package/node_modules/inquirer/dist/commonjs/ui/prompt.d.ts

@@ -1,6 +1,6 @@
 import { Observable } from 'rxjs';
 import type { InquirerReadline } from '@inquirer/type';
-import type { Answers, PromptSession, StreamOptions } from '../types.js';
+import type { Answers, PromptSession, StreamOptions } from '../types.ts';
 export declare const _: {
     set: (obj: Record<string, unknown>, path: string | undefined, value: unknown) => void;
     get: (obj: object, path?: string | number | symbol, defaultValue?: unknown) => any;

package/node_modules/inquirer/dist/esm/index.d.ts

@@ -4,11 +4,11 @@
  */
 import { Separator } from '@inquirer/prompts';
 import type { Prettify } from '@inquirer/type';
-import PromptsRunner from './ui/prompt.js';
-import type { LegacyPromptConstructor, PromptFn } from './ui/prompt.js';
-import type { Answers, CustomQuestion, UnnamedDistinctQuestion, StreamOptions } from './types.js';
+import PromptsRunner from './ui/prompt.ts';
+import type { LegacyPromptConstructor, PromptFn } from './ui/prompt.ts';
+import type { Answers, CustomQuestion, UnnamedDistinctQuestion, StreamOptions } from './types.ts';
 import { Observable } from 'rxjs';
-export type { QuestionMap, Question, DistinctQuestion, Answers, PromptSession, } from './types.js';
+export type { QuestionMap, Question, DistinctQuestion, Answers, PromptSession, } from './types.ts';
 type PromptReturnType<T> = Promise<Prettify<T>> & {
     ui: PromptsRunner<Prettify<T>>;
 };

package/node_modules/inquirer/dist/esm/index.js

@@ -3,7 +3,7 @@
  * A collection of common interactive command line user interfaces.
  */
 import { input, select, number, confirm, rawlist, expand, checkbox, password, editor, search, Separator, } from '@inquirer/prompts';
-import PromptsRunner from './ui/prompt.js';
+import PromptsRunner from "./ui/prompt.js";
 const builtInPrompts = {
     input,
     select,

package/node_modules/inquirer/dist/esm/ui/prompt.d.ts

@@ -1,6 +1,6 @@
 import { Observable } from 'rxjs';
 import type { InquirerReadline } from '@inquirer/type';
-import type { Answers, PromptSession, StreamOptions } from '../types.js';
+import type { Answers, PromptSession, StreamOptions } from '../types.ts';
 export declare const _: {
     set: (obj: Record<string, unknown>, path: string | undefined, value: unknown) => void;
     get: (obj: object, path?: string | number | symbol, defaultValue?: unknown) => any;

package/node_modules/inquirer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inquirer",
-  "version": "12.5.0",
+  "version": "12.5.2",
   "description": "A collection of common interactive command line user interfaces.",
   "keywords": [
     "answer",
@@ -74,9 +74,9 @@
     "tsc": "tshy"
   },
   "dependencies": {
-    "@inquirer/core": "^10.1.9",
-    "@inquirer/prompts": "^7.4.0",
-    "@inquirer/type": "^3.0.5",
+    "@inquirer/core": "^10.1.10",
+    "@inquirer/prompts": "^7.4.1",
+    "@inquirer/type": "^3.0.6",
     "ansi-escapes": "^4.3.2",
     "mute-stream": "^2.0.0",
     "run-async": "^3.0.0",
@@ -108,5 +108,5 @@
       "optional": true
     }
   },
-  "gitHead": "83508f90ca65d26abc1408e4209e4f8fc73e43fe"
+  "gitHead": "b06133f3ff9cc782f8292fd0e474c72f39ff7537"
 }

package/node_modules/typescript/lib/_tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.8";
-var version = "5.8.2";
+var version = "5.8.3";
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -50405,10 +50405,11 @@ function createTypeChecker(host) {
       serializeExistingTypeNode(context, typeNode, addUndefined) {
         return serializeExistingTypeNode(context, typeNode, !!addUndefined);
       },
-      serializeReturnTypeForSignature(syntacticContext, signatureDeclaration) {
+      serializeReturnTypeForSignature(syntacticContext, signatureDeclaration, symbol) {
         const context = syntacticContext;
         const signature = getSignatureFromDeclaration(signatureDeclaration);
-        const returnType = context.enclosingSymbolTypes.get(getSymbolId(getSymbolOfDeclaration(signatureDeclaration))) ?? instantiateType(getReturnTypeOfSignature(signature), context.mapper);
+        symbol ?? (symbol = getSymbolOfDeclaration(signatureDeclaration));
+        const returnType = context.enclosingSymbolTypes.get(getSymbolId(symbol)) ?? instantiateType(getReturnTypeOfSignature(signature), context.mapper);
         return serializeInferredReturnTypeForSignature(context, signature, returnType);
       },
       serializeTypeOfExpression(syntacticContext, expr) {
@@ -50422,7 +50423,7 @@ function createTypeChecker(host) {
         symbol ?? (symbol = getSymbolOfDeclaration(declaration));
         let type = (_a = context.enclosingSymbolTypes) == null ? void 0 : _a.get(getSymbolId(symbol));
         if (type === void 0) {
-          type = symbol && !(symbol.flags & (2048 /* TypeLiteral */ | 131072 /* Signature */)) ? instantiateType(getWidenedLiteralType(getTypeOfSymbol(symbol)), context.mapper) : errorType;
+          type = symbol.flags & 98304 /* Accessor */ && declaration.kind === 178 /* SetAccessor */ ? instantiateType(getWriteTypeOfSymbol(symbol), context.mapper) : symbol && !(symbol.flags & (2048 /* TypeLiteral */ | 131072 /* Signature */)) ? instantiateType(getWidenedLiteralType(getTypeOfSymbol(symbol)), context.mapper) : errorType;
         }
         const addUndefinedForParameter = declaration && (isParameter(declaration) || isJSDocParameterTag(declaration)) && requiresAddingImplicitUndefined(declaration, context.enclosingDeclaration);
         if (addUndefinedForParameter) {
@@ -50482,6 +50483,7 @@ function createTypeChecker(host) {
         const context = syntacticContext;
         if (context.bundled || context.enclosingFile !== getSourceFileOfNode(lit)) {
           let name = lit.text;
+          const originalName = name;
           const nodeSymbol = getNodeLinks(parent).resolvedSymbol;
           const meaning = parent.isTypeOf ? 111551 /* Value */ : 788968 /* Type */;
           const parentSymbol = nodeSymbol && isSymbolAccessible(
@@ -50511,7 +50513,9 @@ function createTypeChecker(host) {
               context.tracker.reportLikelyUnsafeImportRequiredError(name);
             }
           }
-          return name;
+          if (name !== originalName) {
+            return name;
+          }
         }
       },
       canReuseTypeNode(context, typeNode) {
@@ -51568,12 +51572,13 @@ function createTypeChecker(host) {
       if (propertySymbol.flags & 98304 /* Accessor */) {
         const writeType = getWriteTypeOfSymbol(propertySymbol);
         if (propertyType !== writeType && !isErrorType(propertyType) && !isErrorType(writeType)) {
+          const symbolMapper = getSymbolLinks(propertySymbol).mapper;
           const getterDeclaration = getDeclarationOfKind(propertySymbol, 177 /* GetAccessor */);
           const getterSignature = getSignatureFromDeclaration(getterDeclaration);
           typeElements.push(
             setCommentRange2(
               context,
-              signatureToSignatureDeclarationHelper(getterSignature, 177 /* GetAccessor */, context, { name: propertyName }),
+              signatureToSignatureDeclarationHelper(symbolMapper ? instantiateSignature(getterSignature, symbolMapper) : getterSignature, 177 /* GetAccessor */, context, { name: propertyName }),
               getterDeclaration
             )
           );
@@ -51582,7 +51587,7 @@ function createTypeChecker(host) {
           typeElements.push(
             setCommentRange2(
               context,
-              signatureToSignatureDeclarationHelper(setterSignature, 178 /* SetAccessor */, context, { name: propertyName }),
+              signatureToSignatureDeclarationHelper(symbolMapper ? instantiateSignature(setterSignature, symbolMapper) : setterSignature, 178 /* SetAccessor */, context, { name: propertyName }),
               setterDeclaration
             )
           );
@@ -52725,13 +52730,13 @@ function createTypeChecker(host) {
       const addUndefinedForParameter = declaration && (isParameter(declaration) || isJSDocParameterTag(declaration)) && requiresAddingImplicitUndefined(declaration, context.enclosingDeclaration);
       const decl = declaration ?? symbol.valueDeclaration ?? getDeclarationWithTypeAnnotation(symbol) ?? ((_a = symbol.declarations) == null ? void 0 : _a[0]);
       if (decl) {
+        const restore = addSymbolTypeToContext(context, symbol, type);
         if (isAccessor(decl)) {
           result = syntacticNodeBuilder.serializeTypeOfAccessor(decl, symbol, context);
         } else if (hasInferredType(decl) && !nodeIsSynthesized(decl) && !(getObjectFlags(type) & 196608 /* RequiresWidening */)) {
-          const restore = addSymbolTypeToContext(context, symbol, type);
           result = syntacticNodeBuilder.serializeTypeOfDeclaration(decl, symbol, context);
-          restore();
         }
+        restore();
       }
       if (!result) {
         if (addUndefinedForParameter) {
@@ -52885,10 +52890,7 @@ function createTypeChecker(host) {
           /*context*/
           void 0
         );
-        if (updated !== node2) {
-          setTextRange2(context, updated, node2);
-        }
-        return updated;
+        return setTextRange2(context, updated, node2);
       }
     }
     function serializeTypeName(context, node, isTypeOf, typeArguments) {
@@ -76781,6 +76783,11 @@ function createTypeChecker(host) {
       if (file && fileExtensionIsOneOf(file.fileName, [".cts" /* Cts */, ".mts" /* Mts */])) {
         grammarErrorOnNode(node, Diagnostics.This_syntax_is_reserved_in_files_with_the_mts_or_cts_extension_Use_an_as_expression_instead);
       }
+      if (compilerOptions.erasableSyntaxOnly) {
+        const start = skipTrivia(file.text, node.pos);
+        const end = node.expression.pos;
+        diagnostics.add(createFileDiagnostic(file, start, end - start, Diagnostics.This_syntax_is_not_allowed_when_erasableSyntaxOnly_is_enabled));
+      }
     }
     return checkAssertionWorker(node, checkMode);
   }
@@ -131862,9 +131869,11 @@ function createSyntacticTypeNodeBuilder(options, resolver) {
         if (!resolver.canReuseTypeNode(context, node)) {
           return resolver.serializeExistingTypeNode(context, node);
         }
+        const specifier = rewriteModuleSpecifier2(node, node.argument.literal);
+        const literal = specifier === node.argument.literal ? reuseNode(context, node.argument.literal) : specifier;
         return factory.updateImportTypeNode(
           node,
-          factory.updateLiteralTypeNode(node.argument, rewriteModuleSpecifier2(node, node.argument.literal)),
+          literal === node.argument.literal ? reuseNode(context, node.argument) : factory.createLiteralTypeNode(literal),
           visitNode(node.attributes, visitExistingNodeTreeSymbols, isImportAttributes),
           visitNode(node.qualifier, visitExistingNodeTreeSymbols, isEntityName),
           visitNodes2(node.typeArguments, visitExistingNodeTreeSymbols, isTypeNode),
@@ -132019,10 +132028,7 @@ function createSyntacticTypeNodeBuilder(options, resolver) {
       }
       function rewriteModuleSpecifier2(parent, lit) {
         const newName = resolver.getModuleSpecifierOverride(context, parent, lit);
-        if (newName) {
-          return setOriginalNode(factory.createStringLiteral(newName), lit);
-        }
-        return visitNode(lit, visitExistingNodeTreeSymbols, isStringLiteral);
+        return newName ? setOriginalNode(factory.createStringLiteral(newName), lit) : lit;
       }
     }
   }
@@ -132189,12 +132195,7 @@ function createSyntacticTypeNodeBuilder(options, resolver) {
       return withNewScope(context, node, () => serializeTypeAnnotationOfDeclaration(accessorType, context, node, symbol) ?? inferTypeOfDeclaration(node, symbol, context));
     }
     if (accessorDeclarations.getAccessor) {
-      return withNewScope(context, accessorDeclarations.getAccessor, () => createReturnFromSignature(
-        accessorDeclarations.getAccessor,
-        /*symbol*/
-        void 0,
-        context
-      ));
+      return withNewScope(context, accessorDeclarations.getAccessor, () => createReturnFromSignature(accessorDeclarations.getAccessor, symbol, context));
     }
     return void 0;
   }
@@ -132304,14 +132305,14 @@ function createSyntacticTypeNodeBuilder(options, resolver) {
     }
     return resolver.serializeTypeOfExpression(context, node) ?? factory.createKeywordTypeNode(133 /* AnyKeyword */);
   }
-  function inferReturnTypeOfSignatureSignature(node, context, reportFallback) {
+  function inferReturnTypeOfSignatureSignature(node, context, symbol, reportFallback) {
     if (reportFallback) {
       context.tracker.reportInferenceFallback(node);
     }
     if (context.noInferenceFallback === true) {
       return factory.createKeywordTypeNode(133 /* AnyKeyword */);
     }
-    return resolver.serializeReturnTypeForSignature(context, node) ?? factory.createKeywordTypeNode(133 /* AnyKeyword */);
+    return resolver.serializeReturnTypeForSignature(context, node, symbol) ?? factory.createKeywordTypeNode(133 /* AnyKeyword */);
   }
   function inferAccessorType(node, allAccessors, context, symbol, reportFallback = true) {
     if (node.kind === 177 /* GetAccessor */) {
@@ -132601,18 +132602,17 @@ function createSyntacticTypeNodeBuilder(options, resolver) {
     );
   }
   function reuseTypeParameters(typeParameters, context) {
-    return typeParameters == null ? void 0 : typeParameters.map(
-      (tp) => {
-        var _a;
-        return factory.updateTypeParameterDeclaration(
-          tp,
-          (_a = tp.modifiers) == null ? void 0 : _a.map((m) => reuseNode(context, m)),
-          reuseNode(context, tp.name),
-          serializeExistingTypeNodeWithFallback(tp.constraint, context),
-          serializeExistingTypeNodeWithFallback(tp.default, context)
-        );
-      }
-    );
+    return typeParameters == null ? void 0 : typeParameters.map((tp) => {
+      var _a;
+      const { node: tpName } = resolver.trackExistingEntityName(context, tp.name);
+      return factory.updateTypeParameterDeclaration(
+        tp,
+        (_a = tp.modifiers) == null ? void 0 : _a.map((m) => reuseNode(context, m)),
+        tpName,
+        serializeExistingTypeNodeWithFallback(tp.constraint, context),
+        serializeExistingTypeNodeWithFallback(tp.default, context)
+      );
+    });
   }
   function typeFromObjectLiteralMethod(method, name, context, isConstContext) {
     const returnType = createReturnFromSignature(
@@ -132747,7 +132747,7 @@ function createSyntacticTypeNodeBuilder(options, resolver) {
     } else if (isValueSignatureDeclaration(fn)) {
       returnType = typeFromSingleReturnExpression(fn, context);
     }
-    return returnType.type !== void 0 ? returnType.type : inferReturnTypeOfSignatureSignature(fn, context, reportFallback && returnType.reportFallback && !returnTypeNode);
+    return returnType.type !== void 0 ? returnType.type : inferReturnTypeOfSignatureSignature(fn, context, symbol, reportFallback && returnType.reportFallback && !returnTypeNode);
   }
   function typeFromSingleReturnExpression(declaration, context) {
     let candidateExpr;