@typescript-deploys/pr-build 5.5.0-pr-57681-18 → 5.5.0-pr-57912-2

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.20240320`;
+var version = `${versionMajorMinor}.0-insiders.20240322`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -43561,12 +43561,9 @@ function createTypeChecker(host) {
     getExactOptionalProperties,
     getAllPossiblePropertiesOfTypes,
     getSuggestedSymbolForNonexistentProperty,
-    getSuggestionForNonexistentProperty,
     getSuggestedSymbolForNonexistentJSXAttribute,
     getSuggestedSymbolForNonexistentSymbol: (location, name, meaning) => getSuggestedSymbolForNonexistentSymbol(location, escapeLeadingUnderscores(name), meaning),
-    getSuggestionForNonexistentSymbol: (location, name, meaning) => getSuggestionForNonexistentSymbol(location, escapeLeadingUnderscores(name), meaning),
     getSuggestedSymbolForNonexistentModule,
-    getSuggestionForNonexistentExport,
     getSuggestedSymbolForNonexistentClassMember,
     getBaseConstraintOfType,
     getDefaultFromTypeParameter: (type) => type && type.flags & 262144 /* TypeParameter */ ? getDefaultFromTypeParameter(type) : void 0,
@@ -47594,15 +47591,19 @@ function createTypeChecker(host) {
       return true;
     }
   }
-  function isEntityNameVisible(entityName, enclosingDeclaration) {
+  function getMeaningOfEntityNameReference(entityName) {
     let meaning;
     if (entityName.parent.kind === 186 /* TypeQuery */ || entityName.parent.kind === 233 /* ExpressionWithTypeArguments */ && !isPartOfTypeNode(entityName.parent) || entityName.parent.kind === 167 /* ComputedPropertyName */) {
       meaning = 111551 /* Value */ | 1048576 /* ExportValue */;
-    } else if (entityName.kind === 166 /* QualifiedName */ || entityName.kind === 211 /* PropertyAccessExpression */ || entityName.parent.kind === 271 /* ImportEqualsDeclaration */) {
+    } else if (entityName.kind === 166 /* QualifiedName */ || entityName.kind === 211 /* PropertyAccessExpression */ || entityName.parent.kind === 271 /* ImportEqualsDeclaration */ || entityName.parent.kind === 166 /* QualifiedName */ && entityName.parent.left === entityName || entityName.parent.kind === 211 /* PropertyAccessExpression */ && entityName.parent.expression === entityName || entityName.parent.kind === 212 /* ElementAccessExpression */ && entityName.parent.expression === entityName) {
       meaning = 1920 /* Namespace */;
     } else {
       meaning = 788968 /* Type */;
     }
+    return meaning;
+  }
+  function isEntityNameVisible(entityName, enclosingDeclaration) {
+    const meaning = getMeaningOfEntityNameReference(entityName);
     const firstIdentifier = getFirstIdentifier(entityName);
     const symbol = resolveName(
       enclosingDeclaration,
@@ -49709,9 +49710,10 @@ function createTypeChecker(host) {
         introducesError = true;
         return { introducesError, node };
       }
+      const meaning = getMeaningOfEntityNameReference(node);
       const sym = resolveEntityName(
         leftmost,
-        -1 /* All */,
+        meaning,
         /*ignoreErrors*/
         true,
         /*dontResolveAlias*/
@@ -49721,7 +49723,7 @@ function createTypeChecker(host) {
         if (isSymbolAccessible(
           sym,
           context.enclosingDeclaration,
-          -1 /* All */,
+          meaning,
           /*shouldComputeAliasesToMakeVisible*/
           false
         ).accessibility !== 0 /* Accessible */) {
@@ -49729,7 +49731,7 @@ function createTypeChecker(host) {
             introducesError = true;
           }
         } else {
-          context.tracker.trackSymbol(sym, context.enclosingDeclaration, -1 /* All */);
+          context.tracker.trackSymbol(sym, context.enclosingDeclaration, meaning);
           includePrivateSymbol == null ? void 0 : includePrivateSymbol(sym);
         }
         if (isIdentifier(node)) {
@@ -57684,6 +57686,9 @@ function createTypeChecker(host) {
         } else if (every(typeSet, (t) => !!(t.flags & 1048576 /* Union */ && (t.types[0].flags & 65536 /* Null */ || t.types[1].flags & 65536 /* Null */)))) {
           removeFromEach(typeSet, 65536 /* Null */);
           result = getUnionType([getIntersectionType(typeSet), nullType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
+        } else if (typeSet.length >= 4) {
+          const middle = Math.floor(typeSet.length / 2);
+          result = getIntersectionType([getIntersectionType(typeSet.slice(0, middle)), getIntersectionType(typeSet.slice(middle))], aliasSymbol, aliasTypeArguments);
         } else {
           if (!checkCrossProductUnion(typeSet)) {
             return errorType;
@@ -70760,17 +70765,9 @@ function createTypeChecker(host) {
     );
     return result;
   }
-  function getSuggestionForNonexistentSymbol(location, outerName, meaning) {
-    const symbolResult = getSuggestedSymbolForNonexistentSymbol(location, outerName, meaning);
-    return symbolResult && symbolName(symbolResult);
-  }
   function getSuggestedSymbolForNonexistentModule(name, targetModule) {
     return targetModule.exports && getSpellingSuggestionForName(idText(name), getExportsOfModuleAsArray(targetModule), 2623475 /* ModuleMember */);
   }
-  function getSuggestionForNonexistentExport(name, targetModule) {
-    const suggestion = getSuggestedSymbolForNonexistentModule(name, targetModule);
-    return suggestion && symbolName(suggestion);
-  }
   function getSuggestionForNonexistentIndexSignature(objectType, expr, keyedType) {
     function hasProp(name) {
       const prop = getPropertyOfObjectType(objectType, name);
@@ -73901,7 +73898,7 @@ function createTypeChecker(host) {
           /*contextFlags*/
           void 0
         );
-        const returnType2 = contextualReturnType && (unwrapReturnType(contextualReturnType, functionFlags) || voidType).flags & 32768 /* Undefined */ ? undefinedType : voidType;
+        const returnType2 = contextualReturnType && someType(unwrapReturnType(contextualReturnType, functionFlags) || voidType, (t) => !!(t.flags & 32768 /* Undefined */)) ? undefinedType : voidType;
         return functionFlags & 2 /* Async */ ? createPromiseReturnType(func, returnType2) : (
           // Async function
           returnType2
@@ -113576,8 +113573,8 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     }
     function writeDirectives(kind, directives) {
       for (const directive of directives) {
+        const resolutionMode = directive.resolutionMode ? `resolution-mode="${directive.resolutionMode === 99 /* ESNext */ ? "import" : "require"}" ` : "";
         const preserve = directive.preserve ? `preserve="true" ` : "";
-        const resolutionMode = directive.resolutionMode && directive.resolutionMode !== (currentSourceFile == null ? void 0 : currentSourceFile.impliedNodeFormat) ? `resolution-mode="${directive.resolutionMode === 99 /* ESNext */ ? "import" : "require"}" ` : "";
         writeComment(`/// <reference ${kind}="${directive.fileName}" ${resolutionMode}${preserve}/>`);
         writeLine();
       }

package/lib/tsserver.js

@@ -29,23 +29,17 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 
-// src/tsserver/_namespaces/ts.ts
-var ts_exports = {};
-
 // src/typescript/typescript.ts
 var typescript_exports = {};
 __reExport(typescript_exports, require("./typescript.js"));
 
-// src/tsserver/_namespaces/ts.ts
-__reExport(ts_exports, typescript_exports);
-
 // src/tsserver/common.ts
 function getLogLevel(level) {
   if (level) {
     const l = level.toLowerCase();
-    for (const name in ts_exports.server.LogLevel) {
+    for (const name in typescript_exports.server.LogLevel) {
       if (isNaN(+name) && l === name.toLowerCase()) {
-        return ts_exports.server.LogLevel[name];
+        return typescript_exports.server.LogLevel[name];
       }
     }
   }
@@ -71,7 +65,7 @@ function parseLoggingEnvironmentString(logEnvStr) {
           break;
         case "-level":
           const level = getLogLevel(value);
-          logEnv.detailLevel = level !== void 0 ? level : ts_exports.server.LogLevel.normal;
+          logEnv.detailLevel = level !== void 0 ? level : typescript_exports.server.LogLevel.normal;
           break;
         case "-traceToConsole":
           logEnv.traceToConsole = value.toLowerCase() === "true";
@@ -86,35 +80,35 @@ function parseLoggingEnvironmentString(logEnvStr) {
   function getEntireValue(initialIndex) {
     let pathStart = args[initialIndex];
     let extraPartCounter = 0;
-    if (pathStart.charCodeAt(0) === ts_exports.CharacterCodes.doubleQuote && pathStart.charCodeAt(pathStart.length - 1) !== ts_exports.CharacterCodes.doubleQuote) {
+    if (pathStart.charCodeAt(0) === typescript_exports.CharacterCodes.doubleQuote && pathStart.charCodeAt(pathStart.length - 1) !== typescript_exports.CharacterCodes.doubleQuote) {
       for (let i = initialIndex + 1; i < args.length; i++) {
         pathStart += " ";
         pathStart += args[i];
         extraPartCounter++;
-        if (pathStart.charCodeAt(pathStart.length - 1) === ts_exports.CharacterCodes.doubleQuote)
+        if (pathStart.charCodeAt(pathStart.length - 1) === typescript_exports.CharacterCodes.doubleQuote)
           break;
       }
     }
-    return { value: (0, ts_exports.stripQuotes)(pathStart), extraPartCounter };
+    return { value: (0, typescript_exports.stripQuotes)(pathStart), extraPartCounter };
   }
 }
 function parseServerMode() {
-  const mode = ts_exports.server.findArgument("--serverMode");
+  const mode = typescript_exports.server.findArgument("--serverMode");
   if (!mode)
     return void 0;
   switch (mode.toLowerCase()) {
     case "semantic":
-      return ts_exports.LanguageServiceMode.Semantic;
+      return typescript_exports.LanguageServiceMode.Semantic;
     case "partialsemantic":
-      return ts_exports.LanguageServiceMode.PartialSemantic;
+      return typescript_exports.LanguageServiceMode.PartialSemantic;
     case "syntactic":
-      return ts_exports.LanguageServiceMode.Syntactic;
+      return typescript_exports.LanguageServiceMode.Syntactic;
     default:
       return mode;
   }
 }
 function initializeNodeSystem() {
-  const sys4 = ts_exports.Debug.checkDefined(ts_exports.sys);
+  const sys4 = typescript_exports.Debug.checkDefined(typescript_exports.sys);
   const childProcess = require("child_process");
   const fs = require("fs");
   class Logger {
@@ -138,20 +132,20 @@ function initializeNodeSystem() {
     }
     close() {
       if (this.fd >= 0) {
-        fs.close(this.fd, ts_exports.noop);
+        fs.close(this.fd, typescript_exports.noop);
       }
     }
     getLogFileName() {
       return this.logFilename;
     }
     perftrc(s) {
-      this.msg(s, ts_exports.server.Msg.Perf);
+      this.msg(s, typescript_exports.server.Msg.Perf);
     }
     info(s) {
-      this.msg(s, ts_exports.server.Msg.Info);
+      this.msg(s, typescript_exports.server.Msg.Info);
     }
     err(s) {
-      this.msg(s, ts_exports.server.Msg.Err);
+      this.msg(s, typescript_exports.server.Msg.Err);
     }
     startGroup() {
       this.inGroup = true;
@@ -166,22 +160,22 @@ function initializeNodeSystem() {
     hasLevel(level) {
       return this.loggingEnabled() && this.level >= level;
     }
-    msg(s, type = ts_exports.server.Msg.Err) {
+    msg(s, type = typescript_exports.server.Msg.Err) {
       var _a, _b, _c;
       switch (type) {
-        case ts_exports.server.Msg.Info:
-          (_a = ts_exports.perfLogger) == null ? void 0 : _a.logInfoEvent(s);
+        case typescript_exports.server.Msg.Info:
+          (_a = typescript_exports.perfLogger) == null ? void 0 : _a.logInfoEvent(s);
           break;
-        case ts_exports.server.Msg.Perf:
-          (_b = ts_exports.perfLogger) == null ? void 0 : _b.logPerfEvent(s);
+        case typescript_exports.server.Msg.Perf:
+          (_b = typescript_exports.perfLogger) == null ? void 0 : _b.logPerfEvent(s);
           break;
         default:
-          (_c = ts_exports.perfLogger) == null ? void 0 : _c.logErrEvent(s);
+          (_c = typescript_exports.perfLogger) == null ? void 0 : _c.logErrEvent(s);
           break;
       }
       if (!this.canWrite())
         return;
-      s = `[${ts_exports.server.nowString()}] ${s}
+      s = `[${typescript_exports.server.nowString()}] ${s}
 `;
       if (!this.inGroup || this.firstInGroup) {
         const prefix = Logger.padStringRight(type + " " + this.seq.toString(), "          ");
@@ -212,23 +206,23 @@ function initializeNodeSystem() {
       }
     }
   }
-  const libDirectory = (0, ts_exports.getDirectoryPath)((0, ts_exports.normalizePath)(sys4.getExecutingFilePath()));
+  const libDirectory = (0, typescript_exports.getDirectoryPath)((0, typescript_exports.normalizePath)(sys4.getExecutingFilePath()));
   const useWatchGuard = process.platform === "win32";
   const originalWatchDirectory = sys4.watchDirectory.bind(sys4);
   const logger = createLogger();
-  ts_exports.Debug.loggingHost = {
+  typescript_exports.Debug.loggingHost = {
     log(level, s) {
       switch (level) {
-        case ts_exports.LogLevel.Error:
-        case ts_exports.LogLevel.Warning:
-          return logger.msg(s, ts_exports.server.Msg.Err);
-        case ts_exports.LogLevel.Info:
-        case ts_exports.LogLevel.Verbose:
-          return logger.msg(s, ts_exports.server.Msg.Info);
+        case typescript_exports.LogLevel.Error:
+        case typescript_exports.LogLevel.Warning:
+          return logger.msg(s, typescript_exports.server.Msg.Err);
+        case typescript_exports.LogLevel.Info:
+        case typescript_exports.LogLevel.Verbose:
+          return logger.msg(s, typescript_exports.server.Msg.Info);
       }
     }
   };
-  const pending = (0, ts_exports.createQueue)();
+  const pending = (0, typescript_exports.createQueue)();
   let canWrite = true;
   if (useWatchGuard) {
     const currentDrive = extractWatchDirectoryCacheKey(
@@ -241,35 +235,35 @@ function initializeNodeSystem() {
       const cacheKey = extractWatchDirectoryCacheKey(path, currentDrive);
       let status = cacheKey && statusCache.get(cacheKey);
       if (status === void 0) {
-        if (logger.hasLevel(ts_exports.server.LogLevel.verbose)) {
+        if (logger.hasLevel(typescript_exports.server.LogLevel.verbose)) {
           logger.info(`${cacheKey} for path ${path} not found in cache...`);
         }
         try {
-          const args = [(0, ts_exports.combinePaths)(libDirectory, "watchGuard.js"), path];
-          if (logger.hasLevel(ts_exports.server.LogLevel.verbose)) {
-            logger.info(`Starting ${process.execPath} with args:${ts_exports.server.stringifyIndented(args)}`);
+          const args = [(0, typescript_exports.combinePaths)(libDirectory, "watchGuard.js"), path];
+          if (logger.hasLevel(typescript_exports.server.LogLevel.verbose)) {
+            logger.info(`Starting ${process.execPath} with args:${typescript_exports.server.stringifyIndented(args)}`);
           }
           childProcess.execFileSync(process.execPath, args, { stdio: "ignore", env: { ELECTRON_RUN_AS_NODE: "1" } });
           status = true;
-          if (logger.hasLevel(ts_exports.server.LogLevel.verbose)) {
+          if (logger.hasLevel(typescript_exports.server.LogLevel.verbose)) {
             logger.info(`WatchGuard for path ${path} returned: OK`);
           }
         } catch (e) {
           status = false;
-          if (logger.hasLevel(ts_exports.server.LogLevel.verbose)) {
+          if (logger.hasLevel(typescript_exports.server.LogLevel.verbose)) {
             logger.info(`WatchGuard for path ${path} returned: ${e.message}`);
           }
         }
         if (cacheKey) {
           statusCache.set(cacheKey, status);
         }
-      } else if (logger.hasLevel(ts_exports.server.LogLevel.verbose)) {
+      } else if (logger.hasLevel(typescript_exports.server.LogLevel.verbose)) {
         logger.info(`watchDirectory for ${path} uses cached drive information.`);
       }
       if (status) {
         return watchDirectorySwallowingException(path, callback, recursive, options);
       } else {
-        return ts_exports.noopFileWatcher;
+        return typescript_exports.noopFileWatcher;
       }
     };
   } else {
@@ -291,11 +285,11 @@ function initializeNodeSystem() {
     const factory = require("./cancellationToken");
     cancellationToken = factory(sys4.args);
   } catch (e) {
-    cancellationToken = ts_exports.server.nullCancellationToken;
+    cancellationToken = typescript_exports.server.nullCancellationToken;
   }
-  const localeStr = ts_exports.server.findArgument("--locale");
+  const localeStr = typescript_exports.server.findArgument("--locale");
   if (localeStr) {
-    (0, ts_exports.validateLocaleAndSetLanguage)(localeStr, sys4);
+    (0, typescript_exports.validateLocaleAndSetLanguage)(localeStr, sys4);
   }
   const modeOrUnknown = parseServerMode();
   let serverMode;
@@ -315,10 +309,10 @@ function initializeNodeSystem() {
     startSession: startNodeSession
   };
   function createLogger() {
-    const cmdLineLogFileName = ts_exports.server.findArgument("--logFile");
-    const cmdLineVerbosity = getLogLevel(ts_exports.server.findArgument("--logVerbosity"));
+    const cmdLineLogFileName = typescript_exports.server.findArgument("--logFile");
+    const cmdLineVerbosity = getLogLevel(typescript_exports.server.findArgument("--logVerbosity"));
     const envLogOptions = parseLoggingEnvironmentString(process.env.TSS_LOG);
-    const unsubstitutedLogFileName = cmdLineLogFileName ? (0, ts_exports.stripQuotes)(cmdLineLogFileName) : envLogOptions.logToFile ? envLogOptions.file || libDirectory + "/.log" + process.pid.toString() : void 0;
+    const unsubstitutedLogFileName = cmdLineLogFileName ? (0, typescript_exports.stripQuotes)(cmdLineLogFileName) : envLogOptions.logToFile ? envLogOptions.file || libDirectory + "/.log" + process.pid.toString() : void 0;
     const substitutedLogFileName = unsubstitutedLogFileName ? unsubstitutedLogFileName.replace("PID", process.pid.toString()) : void 0;
     const logVerbosity = cmdLineVerbosity || envLogOptions.detailLevel;
     return new Logger(substitutedLogFileName, envLogOptions.traceToConsole, logVerbosity);
@@ -338,32 +332,32 @@ function initializeNodeSystem() {
     }
   }
   function extractWatchDirectoryCacheKey(path, currentDriveKey) {
-    path = (0, ts_exports.normalizeSlashes)(path);
+    path = (0, typescript_exports.normalizeSlashes)(path);
     if (isUNCPath(path)) {
-      const firstSlash = path.indexOf(ts_exports.directorySeparator, 2);
-      return firstSlash !== -1 ? (0, ts_exports.toFileNameLowerCase)(path.substring(0, firstSlash)) : path;
+      const firstSlash = path.indexOf(typescript_exports.directorySeparator, 2);
+      return firstSlash !== -1 ? (0, typescript_exports.toFileNameLowerCase)(path.substring(0, firstSlash)) : path;
     }
-    const rootLength = (0, ts_exports.getRootLength)(path);
+    const rootLength = (0, typescript_exports.getRootLength)(path);
     if (rootLength === 0) {
       return currentDriveKey;
     }
-    if (path.charCodeAt(1) === ts_exports.CharacterCodes.colon && path.charCodeAt(2) === ts_exports.CharacterCodes.slash) {
-      return (0, ts_exports.toFileNameLowerCase)(path.charAt(0));
+    if (path.charCodeAt(1) === typescript_exports.CharacterCodes.colon && path.charCodeAt(2) === typescript_exports.CharacterCodes.slash) {
+      return (0, typescript_exports.toFileNameLowerCase)(path.charAt(0));
     }
-    if (path.charCodeAt(0) === ts_exports.CharacterCodes.slash && path.charCodeAt(1) !== ts_exports.CharacterCodes.slash) {
+    if (path.charCodeAt(0) === typescript_exports.CharacterCodes.slash && path.charCodeAt(1) !== typescript_exports.CharacterCodes.slash) {
       return currentDriveKey;
     }
     return void 0;
   }
   function isUNCPath(s) {
-    return s.length > 2 && s.charCodeAt(0) === ts_exports.CharacterCodes.slash && s.charCodeAt(1) === ts_exports.CharacterCodes.slash;
+    return s.length > 2 && s.charCodeAt(0) === typescript_exports.CharacterCodes.slash && s.charCodeAt(1) === typescript_exports.CharacterCodes.slash;
   }
   function watchDirectorySwallowingException(path, callback, recursive, options) {
     try {
       return originalWatchDirectory(path, callback, recursive, options);
     } catch (e) {
       logger.info(`Exception when creating directory watcher: ${e.message}`);
-      return ts_exports.noopFileWatcher;
+      return typescript_exports.noopFileWatcher;
     }
   }
 }
@@ -381,7 +375,7 @@ function startNodeSession(options, logger, cancellationToken) {
     output: process.stdout,
     terminal: false
   });
-  const _NodeTypingsInstallerAdapter = class _NodeTypingsInstallerAdapter extends ts_exports.server.TypingsInstallerAdapter {
+  const _NodeTypingsInstallerAdapter = class _NodeTypingsInstallerAdapter extends typescript_exports.server.TypingsInstallerAdapter {
     constructor(telemetryEnabled2, logger2, host, globalTypingsCacheLocation, typingSafeListLocation2, typesMapLocation2, npmLocation2, validateDefaultNpmLocation2, event) {
       super(
         telemetryEnabled2,
@@ -397,27 +391,27 @@ function startNodeSession(options, logger, cancellationToken) {
       this.validateDefaultNpmLocation = validateDefaultNpmLocation2;
     }
     createInstallerProcess() {
-      if (this.logger.hasLevel(ts_exports.server.LogLevel.requestTime)) {
+      if (this.logger.hasLevel(typescript_exports.server.LogLevel.requestTime)) {
         this.logger.info("Binding...");
       }
-      const args = [ts_exports.server.Arguments.GlobalCacheLocation, this.globalTypingsCacheLocation];
+      const args = [typescript_exports.server.Arguments.GlobalCacheLocation, this.globalTypingsCacheLocation];
       if (this.telemetryEnabled) {
-        args.push(ts_exports.server.Arguments.EnableTelemetry);
+        args.push(typescript_exports.server.Arguments.EnableTelemetry);
       }
       if (this.logger.loggingEnabled() && this.logger.getLogFileName()) {
-        args.push(ts_exports.server.Arguments.LogFile, (0, ts_exports.combinePaths)((0, ts_exports.getDirectoryPath)((0, ts_exports.normalizeSlashes)(this.logger.getLogFileName())), `ti-${process.pid}.log`));
+        args.push(typescript_exports.server.Arguments.LogFile, (0, typescript_exports.combinePaths)((0, typescript_exports.getDirectoryPath)((0, typescript_exports.normalizeSlashes)(this.logger.getLogFileName())), `ti-${process.pid}.log`));
       }
       if (this.typingSafeListLocation) {
-        args.push(ts_exports.server.Arguments.TypingSafeListLocation, this.typingSafeListLocation);
+        args.push(typescript_exports.server.Arguments.TypingSafeListLocation, this.typingSafeListLocation);
       }
       if (this.typesMapLocation) {
-        args.push(ts_exports.server.Arguments.TypesMapLocation, this.typesMapLocation);
+        args.push(typescript_exports.server.Arguments.TypesMapLocation, this.typesMapLocation);
       }
       if (this.npmLocation) {
-        args.push(ts_exports.server.Arguments.NpmLocation, this.npmLocation);
+        args.push(typescript_exports.server.Arguments.NpmLocation, this.npmLocation);
       }
       if (this.validateDefaultNpmLocation) {
-        args.push(ts_exports.server.Arguments.ValidateDefaultNpmLocation);
+        args.push(typescript_exports.server.Arguments.ValidateDefaultNpmLocation);
       }
       const execArgv = [];
       for (const arg of process.execArgv) {
@@ -428,7 +422,7 @@ function startNodeSession(options, logger, cancellationToken) {
           break;
         }
       }
-      const typingsInstaller = (0, ts_exports.combinePaths)((0, ts_exports.getDirectoryPath)(ts_exports.sys.getExecutingFilePath()), "typingsInstaller.js");
+      const typingsInstaller = (0, typescript_exports.combinePaths)((0, typescript_exports.getDirectoryPath)(typescript_exports.sys.getExecutingFilePath()), "typingsInstaller.js");
       this.installer = childProcess.fork(typingsInstaller, args, { execArgv });
       this.installer.on("message", (m) => this.handleMessage(m));
       this.host.setImmediate(() => this.event({ pid: this.installer.pid }, "typingsInstallerPid"));
@@ -445,12 +439,12 @@ function startNodeSession(options, logger, cancellationToken) {
   // buffer, but we have yet to find a way to retrieve that value.
   _NodeTypingsInstallerAdapter.maxActiveRequestCount = 10;
   let NodeTypingsInstallerAdapter = _NodeTypingsInstallerAdapter;
-  class IOSession extends ts_exports.server.Session {
+  class IOSession extends typescript_exports.server.Session {
     constructor() {
       const event = (body, eventName) => {
         this.event(body, eventName);
       };
-      const host = ts_exports.sys;
+      const host = typescript_exports.sys;
       const typingsInstaller = disableAutomaticTypingAcquisition ? void 0 : new NodeTypingsInstallerAdapter(telemetryEnabled, logger, host, getGlobalTypingsCacheLocation(), typingSafeListLocation, typesMapLocation, npmLocation, validateDefaultNpmLocation, event);
       super({
         host,
@@ -478,16 +472,16 @@ function startNodeSession(options, logger, cancellationToken) {
       this.constructed = true;
     }
     event(body, eventName) {
-      ts_exports.Debug.assert(!!this.constructed, "Should only call `IOSession.prototype.event` on an initialized IOSession");
+      typescript_exports.Debug.assert(!!this.constructed, "Should only call `IOSession.prototype.event` on an initialized IOSession");
       if (this.canUseEvents && this.eventPort) {
         if (!this.eventSocket) {
-          if (this.logger.hasLevel(ts_exports.server.LogLevel.verbose)) {
+          if (this.logger.hasLevel(typescript_exports.server.LogLevel.verbose)) {
             this.logger.info(`eventPort: event "${eventName}" queued, but socket not yet initialized`);
           }
           (this.socketEventQueue || (this.socketEventQueue = [])).push({ body, eventName });
           return;
         } else {
-          ts_exports.Debug.assert(this.socketEventQueue === void 0);
+          typescript_exports.Debug.assert(this.socketEventQueue === void 0);
           this.writeToEventSocket(body, eventName);
         }
       } else {
@@ -495,13 +489,13 @@ function startNodeSession(options, logger, cancellationToken) {
       }
     }
     writeToEventSocket(body, eventName) {
-      this.eventSocket.write(ts_exports.server.formatMessage(ts_exports.server.toEvent(eventName, body), this.logger, this.byteLength, this.host.newLine), "utf8");
+      this.eventSocket.write(typescript_exports.server.formatMessage(typescript_exports.server.toEvent(eventName, body), this.logger, this.byteLength, this.host.newLine), "utf8");
     }
     exit() {
       var _a;
       this.logger.info("Exiting...");
       this.projectService.closeLog();
-      (_a = ts_exports.tracing) == null ? void 0 : _a.stopTracing();
+      (_a = typescript_exports.tracing) == null ? void 0 : _a.stopTracing();
       process.exit(0);
     }
     listen() {
@@ -516,10 +510,10 @@ function startNodeSession(options, logger, cancellationToken) {
   }
   class IpcIOSession extends IOSession {
     writeMessage(msg) {
-      const verboseLogging = logger.hasLevel(ts_exports.server.LogLevel.verbose);
+      const verboseLogging = logger.hasLevel(typescript_exports.server.LogLevel.verbose);
       if (verboseLogging) {
         const json = JSON.stringify(msg);
-        logger.info(`${msg.type}:${ts_exports.server.indent(json)}`);
+        logger.info(`${msg.type}:${typescript_exports.server.indent(json)}`);
       }
       process.send(msg);
     }
@@ -538,18 +532,18 @@ function startNodeSession(options, logger, cancellationToken) {
       });
     }
   }
-  const eventPort = parseEventPort(ts_exports.server.findArgument("--eventPort"));
-  const typingSafeListLocation = ts_exports.server.findArgument(ts_exports.server.Arguments.TypingSafeListLocation);
-  const typesMapLocation = ts_exports.server.findArgument(ts_exports.server.Arguments.TypesMapLocation) || (0, ts_exports.combinePaths)((0, ts_exports.getDirectoryPath)(ts_exports.sys.getExecutingFilePath()), "typesMap.json");
-  const npmLocation = ts_exports.server.findArgument(ts_exports.server.Arguments.NpmLocation);
-  const validateDefaultNpmLocation = ts_exports.server.hasArgument(ts_exports.server.Arguments.ValidateDefaultNpmLocation);
-  const disableAutomaticTypingAcquisition = ts_exports.server.hasArgument("--disableAutomaticTypingAcquisition");
-  const useNodeIpc = ts_exports.server.hasArgument("--useNodeIpc");
-  const telemetryEnabled = ts_exports.server.hasArgument(ts_exports.server.Arguments.EnableTelemetry);
-  const commandLineTraceDir = ts_exports.server.findArgument("--traceDirectory");
-  const traceDir = commandLineTraceDir ? (0, ts_exports.stripQuotes)(commandLineTraceDir) : process.env.TSS_TRACE;
+  const eventPort = parseEventPort(typescript_exports.server.findArgument("--eventPort"));
+  const typingSafeListLocation = typescript_exports.server.findArgument(typescript_exports.server.Arguments.TypingSafeListLocation);
+  const typesMapLocation = typescript_exports.server.findArgument(typescript_exports.server.Arguments.TypesMapLocation) || (0, typescript_exports.combinePaths)((0, typescript_exports.getDirectoryPath)(typescript_exports.sys.getExecutingFilePath()), "typesMap.json");
+  const npmLocation = typescript_exports.server.findArgument(typescript_exports.server.Arguments.NpmLocation);
+  const validateDefaultNpmLocation = typescript_exports.server.hasArgument(typescript_exports.server.Arguments.ValidateDefaultNpmLocation);
+  const disableAutomaticTypingAcquisition = typescript_exports.server.hasArgument("--disableAutomaticTypingAcquisition");
+  const useNodeIpc = typescript_exports.server.hasArgument("--useNodeIpc");
+  const telemetryEnabled = typescript_exports.server.hasArgument(typescript_exports.server.Arguments.EnableTelemetry);
+  const commandLineTraceDir = typescript_exports.server.findArgument("--traceDirectory");
+  const traceDir = commandLineTraceDir ? (0, typescript_exports.stripQuotes)(commandLineTraceDir) : process.env.TSS_TRACE;
   if (traceDir) {
-    (0, ts_exports.startTracing)("server", traceDir);
+    (0, typescript_exports.startTracing)("server", traceDir);
   }
   const ioSession = useNodeIpc ? new IpcIOSession() : new IOSession();
   process.on("uncaughtException", (err) => {
@@ -560,8 +554,8 @@ function startNodeSession(options, logger, cancellationToken) {
   function getGlobalTypingsCacheLocation() {
     switch (process.platform) {
       case "win32": {
-        const basePath = process.env.LOCALAPPDATA || process.env.APPDATA || os.homedir && os.homedir() || process.env.USERPROFILE || process.env.HOMEDRIVE && process.env.HOMEPATH && (0, ts_exports.normalizeSlashes)(process.env.HOMEDRIVE + process.env.HOMEPATH) || os.tmpdir();
-        return (0, ts_exports.combinePaths)((0, ts_exports.combinePaths)((0, ts_exports.normalizeSlashes)(basePath), "Microsoft/TypeScript"), ts_exports.versionMajorMinor);
+        const basePath = process.env.LOCALAPPDATA || process.env.APPDATA || os.homedir && os.homedir() || process.env.USERPROFILE || process.env.HOMEDRIVE && process.env.HOMEPATH && (0, typescript_exports.normalizeSlashes)(process.env.HOMEDRIVE + process.env.HOMEPATH) || os.tmpdir();
+        return (0, typescript_exports.combinePaths)((0, typescript_exports.combinePaths)((0, typescript_exports.normalizeSlashes)(basePath), "Microsoft/TypeScript"), typescript_exports.versionMajorMinor);
       }
       case "openbsd":
       case "freebsd":
@@ -570,10 +564,10 @@ function startNodeSession(options, logger, cancellationToken) {
       case "linux":
       case "android": {
         const cacheLocation = getNonWindowsCacheLocation(process.platform === "darwin");
-        return (0, ts_exports.combinePaths)((0, ts_exports.combinePaths)(cacheLocation, "typescript"), ts_exports.versionMajorMinor);
+        return (0, typescript_exports.combinePaths)((0, typescript_exports.combinePaths)(cacheLocation, "typescript"), typescript_exports.versionMajorMinor);
       }
       default:
-        return ts_exports.Debug.fail(`unsupported platform '${process.platform}'`);
+        return typescript_exports.Debug.fail(`unsupported platform '${process.platform}'`);
     }
   }
   function getNonWindowsCacheLocation(platformIsDarwin) {
@@ -583,50 +577,50 @@ function startNodeSession(options, logger, cancellationToken) {
     const usersDir = platformIsDarwin ? "Users" : "home";
     const homePath = os.homedir && os.homedir() || process.env.HOME || (process.env.LOGNAME || process.env.USER) && `/${usersDir}/${process.env.LOGNAME || process.env.USER}` || os.tmpdir();
     const cacheFolder = platformIsDarwin ? "Library/Caches" : ".cache";
-    return (0, ts_exports.combinePaths)((0, ts_exports.normalizeSlashes)(homePath), cacheFolder);
+    return (0, typescript_exports.combinePaths)((0, typescript_exports.normalizeSlashes)(homePath), cacheFolder);
   }
 }
 
 // src/tsserver/server.ts
 function findArgumentStringArray(argName) {
-  const arg = ts_exports.server.findArgument(argName);
+  const arg = typescript_exports.server.findArgument(argName);
   if (arg === void 0) {
-    return ts_exports.emptyArray;
+    return typescript_exports.emptyArray;
   }
   return arg.split(",").filter((name) => name !== "");
 }
 function start({ args, logger, cancellationToken, serverMode, unknownServerMode, startSession: startServer }, platform) {
   logger.info(`Starting TS Server`);
-  logger.info(`Version: ${ts_exports.version}`);
+  logger.info(`Version: ${typescript_exports.version}`);
   logger.info(`Arguments: ${args.join(" ")}`);
-  logger.info(`Platform: ${platform} NodeVersion: ${process.version} CaseSensitive: ${ts_exports.sys.useCaseSensitiveFileNames}`);
+  logger.info(`Platform: ${platform} NodeVersion: ${process.version} CaseSensitive: ${typescript_exports.sys.useCaseSensitiveFileNames}`);
   logger.info(`ServerMode: ${serverMode} hasUnknownServerMode: ${unknownServerMode}`);
-  ts_exports.setStackTraceLimit();
-  if (ts_exports.Debug.isDebugging) {
-    ts_exports.Debug.enableDebugInfo();
+  typescript_exports.setStackTraceLimit();
+  if (typescript_exports.Debug.isDebugging) {
+    typescript_exports.Debug.enableDebugInfo();
   }
-  if (ts_exports.sys.tryEnableSourceMapsForHost && /^development$/i.test(ts_exports.sys.getEnvironmentVariable("NODE_ENV"))) {
-    ts_exports.sys.tryEnableSourceMapsForHost();
+  if (typescript_exports.sys.tryEnableSourceMapsForHost && /^development$/i.test(typescript_exports.sys.getEnvironmentVariable("NODE_ENV"))) {
+    typescript_exports.sys.tryEnableSourceMapsForHost();
   }
-  console.log = (...args2) => logger.msg(args2.length === 1 ? args2[0] : args2.join(", "), ts_exports.server.Msg.Info);
-  console.warn = (...args2) => logger.msg(args2.length === 1 ? args2[0] : args2.join(", "), ts_exports.server.Msg.Err);
-  console.error = (...args2) => logger.msg(args2.length === 1 ? args2[0] : args2.join(", "), ts_exports.server.Msg.Err);
+  console.log = (...args2) => logger.msg(args2.length === 1 ? args2[0] : args2.join(", "), typescript_exports.server.Msg.Info);
+  console.warn = (...args2) => logger.msg(args2.length === 1 ? args2[0] : args2.join(", "), typescript_exports.server.Msg.Err);
+  console.error = (...args2) => logger.msg(args2.length === 1 ? args2[0] : args2.join(", "), typescript_exports.server.Msg.Err);
   startServer(
     {
       globalPlugins: findArgumentStringArray("--globalPlugins"),
       pluginProbeLocations: findArgumentStringArray("--pluginProbeLocations"),
-      allowLocalPluginLoads: ts_exports.server.hasArgument("--allowLocalPluginLoads"),
-      useSingleInferredProject: ts_exports.server.hasArgument("--useSingleInferredProject"),
-      useInferredProjectPerProjectRoot: ts_exports.server.hasArgument("--useInferredProjectPerProjectRoot"),
-      suppressDiagnosticEvents: ts_exports.server.hasArgument("--suppressDiagnosticEvents"),
-      noGetErrOnBackgroundUpdate: ts_exports.server.hasArgument("--noGetErrOnBackgroundUpdate"),
-      canUseWatchEvents: ts_exports.server.hasArgument("--canUseWatchEvents"),
+      allowLocalPluginLoads: typescript_exports.server.hasArgument("--allowLocalPluginLoads"),
+      useSingleInferredProject: typescript_exports.server.hasArgument("--useSingleInferredProject"),
+      useInferredProjectPerProjectRoot: typescript_exports.server.hasArgument("--useInferredProjectPerProjectRoot"),
+      suppressDiagnosticEvents: typescript_exports.server.hasArgument("--suppressDiagnosticEvents"),
+      noGetErrOnBackgroundUpdate: typescript_exports.server.hasArgument("--noGetErrOnBackgroundUpdate"),
+      canUseWatchEvents: typescript_exports.server.hasArgument("--canUseWatchEvents"),
       serverMode
     },
     logger,
     cancellationToken
   );
 }
-ts_exports.setStackTraceLimit();
+typescript_exports.setStackTraceLimit();
 start(initializeNodeSystem(), require("os").platform());
 //# sourceMappingURL=tsserver.js.map

package/lib/typescript.js

@@ -2326,7 +2326,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.5";
-var version = `${versionMajorMinor}.0-insiders.20240320`;
+var version = `${versionMajorMinor}.0-insiders.20240322`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -48323,12 +48323,9 @@ function createTypeChecker(host) {
     getExactOptionalProperties,
     getAllPossiblePropertiesOfTypes,
     getSuggestedSymbolForNonexistentProperty,
-    getSuggestionForNonexistentProperty,
     getSuggestedSymbolForNonexistentJSXAttribute,
     getSuggestedSymbolForNonexistentSymbol: (location, name, meaning) => getSuggestedSymbolForNonexistentSymbol(location, escapeLeadingUnderscores(name), meaning),
-    getSuggestionForNonexistentSymbol: (location, name, meaning) => getSuggestionForNonexistentSymbol(location, escapeLeadingUnderscores(name), meaning),
     getSuggestedSymbolForNonexistentModule,
-    getSuggestionForNonexistentExport,
     getSuggestedSymbolForNonexistentClassMember,
     getBaseConstraintOfType,
     getDefaultFromTypeParameter: (type) => type && type.flags & 262144 /* TypeParameter */ ? getDefaultFromTypeParameter(type) : void 0,
@@ -52356,15 +52353,19 @@ function createTypeChecker(host) {
       return true;
     }
   }
-  function isEntityNameVisible(entityName, enclosingDeclaration) {
+  function getMeaningOfEntityNameReference(entityName) {
     let meaning;
     if (entityName.parent.kind === 186 /* TypeQuery */ || entityName.parent.kind === 233 /* ExpressionWithTypeArguments */ && !isPartOfTypeNode(entityName.parent) || entityName.parent.kind === 167 /* ComputedPropertyName */) {
       meaning = 111551 /* Value */ | 1048576 /* ExportValue */;
-    } else if (entityName.kind === 166 /* QualifiedName */ || entityName.kind === 211 /* PropertyAccessExpression */ || entityName.parent.kind === 271 /* ImportEqualsDeclaration */) {
+    } else if (entityName.kind === 166 /* QualifiedName */ || entityName.kind === 211 /* PropertyAccessExpression */ || entityName.parent.kind === 271 /* ImportEqualsDeclaration */ || entityName.parent.kind === 166 /* QualifiedName */ && entityName.parent.left === entityName || entityName.parent.kind === 211 /* PropertyAccessExpression */ && entityName.parent.expression === entityName || entityName.parent.kind === 212 /* ElementAccessExpression */ && entityName.parent.expression === entityName) {
       meaning = 1920 /* Namespace */;
     } else {
       meaning = 788968 /* Type */;
     }
+    return meaning;
+  }
+  function isEntityNameVisible(entityName, enclosingDeclaration) {
+    const meaning = getMeaningOfEntityNameReference(entityName);
     const firstIdentifier = getFirstIdentifier(entityName);
     const symbol = resolveName(
       enclosingDeclaration,
@@ -54471,9 +54472,10 @@ function createTypeChecker(host) {
         introducesError = true;
         return { introducesError, node };
       }
+      const meaning = getMeaningOfEntityNameReference(node);
       const sym = resolveEntityName(
         leftmost,
-        -1 /* All */,
+        meaning,
         /*ignoreErrors*/
         true,
         /*dontResolveAlias*/
@@ -54483,7 +54485,7 @@ function createTypeChecker(host) {
         if (isSymbolAccessible(
           sym,
           context.enclosingDeclaration,
-          -1 /* All */,
+          meaning,
           /*shouldComputeAliasesToMakeVisible*/
           false
         ).accessibility !== 0 /* Accessible */) {
@@ -54491,7 +54493,7 @@ function createTypeChecker(host) {
             introducesError = true;
           }
         } else {
-          context.tracker.trackSymbol(sym, context.enclosingDeclaration, -1 /* All */);
+          context.tracker.trackSymbol(sym, context.enclosingDeclaration, meaning);
           includePrivateSymbol == null ? void 0 : includePrivateSymbol(sym);
         }
         if (isIdentifier(node)) {
@@ -62446,6 +62448,9 @@ function createTypeChecker(host) {
         } else if (every(typeSet, (t) => !!(t.flags & 1048576 /* Union */ && (t.types[0].flags & 65536 /* Null */ || t.types[1].flags & 65536 /* Null */)))) {
           removeFromEach(typeSet, 65536 /* Null */);
           result = getUnionType([getIntersectionType(typeSet), nullType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
+        } else if (typeSet.length >= 4) {
+          const middle = Math.floor(typeSet.length / 2);
+          result = getIntersectionType([getIntersectionType(typeSet.slice(0, middle)), getIntersectionType(typeSet.slice(middle))], aliasSymbol, aliasTypeArguments);
         } else {
           if (!checkCrossProductUnion(typeSet)) {
             return errorType;
@@ -75522,17 +75527,9 @@ function createTypeChecker(host) {
     );
     return result;
   }
-  function getSuggestionForNonexistentSymbol(location, outerName, meaning) {
-    const symbolResult = getSuggestedSymbolForNonexistentSymbol(location, outerName, meaning);
-    return symbolResult && symbolName(symbolResult);
-  }
   function getSuggestedSymbolForNonexistentModule(name, targetModule) {
     return targetModule.exports && getSpellingSuggestionForName(idText(name), getExportsOfModuleAsArray(targetModule), 2623475 /* ModuleMember */);
   }
-  function getSuggestionForNonexistentExport(name, targetModule) {
-    const suggestion = getSuggestedSymbolForNonexistentModule(name, targetModule);
-    return suggestion && symbolName(suggestion);
-  }
   function getSuggestionForNonexistentIndexSignature(objectType, expr, keyedType) {
     function hasProp(name) {
       const prop = getPropertyOfObjectType(objectType, name);
@@ -78663,7 +78660,7 @@ function createTypeChecker(host) {
           /*contextFlags*/
           void 0
         );
-        const returnType2 = contextualReturnType && (unwrapReturnType(contextualReturnType, functionFlags) || voidType).flags & 32768 /* Undefined */ ? undefinedType : voidType;
+        const returnType2 = contextualReturnType && someType(unwrapReturnType(contextualReturnType, functionFlags) || voidType, (t) => !!(t.flags & 32768 /* Undefined */)) ? undefinedType : voidType;
         return functionFlags & 2 /* Async */ ? createPromiseReturnType(func, returnType2) : (
           // Async function
           returnType2
@@ -118536,8 +118533,8 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     }
     function writeDirectives(kind, directives) {
       for (const directive of directives) {
+        const resolutionMode = directive.resolutionMode ? `resolution-mode="${directive.resolutionMode === 99 /* ESNext */ ? "import" : "require"}" ` : "";
         const preserve = directive.preserve ? `preserve="true" ` : "";
-        const resolutionMode = directive.resolutionMode && directive.resolutionMode !== (currentSourceFile == null ? void 0 : currentSourceFile.impliedNodeFormat) ? `resolution-mode="${directive.resolutionMode === 99 /* ESNext */ ? "import" : "require"}" ` : "";
         writeComment(`/// <reference ${kind}="${directive.fileName}" ${resolutionMode}${preserve}/>`);
         writeLine();
       }
@@ -131171,11 +131168,11 @@ var OrganizeImportsMode = /* @__PURE__ */ ((OrganizeImportsMode2) => {
   OrganizeImportsMode2["RemoveUnused"] = "RemoveUnused";
   return OrganizeImportsMode2;
 })(OrganizeImportsMode || {});
-var CompletionTriggerKind = /* @__PURE__ */ ((CompletionTriggerKind3) => {
-  CompletionTriggerKind3[CompletionTriggerKind3["Invoked"] = 1] = "Invoked";
-  CompletionTriggerKind3[CompletionTriggerKind3["TriggerCharacter"] = 2] = "TriggerCharacter";
-  CompletionTriggerKind3[CompletionTriggerKind3["TriggerForIncompleteCompletions"] = 3] = "TriggerForIncompleteCompletions";
-  return CompletionTriggerKind3;
+var CompletionTriggerKind = /* @__PURE__ */ ((CompletionTriggerKind2) => {
+  CompletionTriggerKind2[CompletionTriggerKind2["Invoked"] = 1] = "Invoked";
+  CompletionTriggerKind2[CompletionTriggerKind2["TriggerCharacter"] = 2] = "TriggerCharacter";
+  CompletionTriggerKind2[CompletionTriggerKind2["TriggerForIncompleteCompletions"] = 3] = "TriggerForIncompleteCompletions";
+  return CompletionTriggerKind2;
 })(CompletionTriggerKind || {});
 var InlayHintKind = /* @__PURE__ */ ((InlayHintKind2) => {
   InlayHintKind2["Type"] = "Type";
@@ -132795,9 +132792,13 @@ function createTextSpanFromNode(node, sourceFile, endNode2) {
   return createTextSpanFromBounds(node.getStart(sourceFile), (endNode2 || node).getEnd());
 }
 function createTextSpanFromStringLiteralLikeContent(node) {
-  if (node.isUnterminated)
-    return void 0;
-  return createTextSpanFromBounds(node.getStart() + 1, node.getEnd() - 1);
+  let replacementEnd = node.getEnd() - 1;
+  if (node.isUnterminated) {
+    if (node.getStart() === replacementEnd)
+      return void 0;
+    replacementEnd = node.getEnd();
+  }
+  return createTextSpanFromBounds(node.getStart() + 1, replacementEnd);
 }
 function createTextRangeFromNode(node, sourceFile) {
   return createRange(node.getStart(sourceFile), node.end);
@@ -139820,7 +139821,9 @@ function updateImportsInOtherFiles(changes, program, host, oldFile, movedSymbols
           return !!symbol && movedSymbols.has(symbol);
         };
         deleteUnusedImports(sourceFile, importNode, changes, shouldMove);
-        const pathToTargetFileWithExtension = resolvePath(getDirectoryPath(oldFile.path), targetFileName);
+        const pathToTargetFileWithExtension = resolvePath(getDirectoryPath(getNormalizedAbsolutePath(oldFile.fileName, program.getCurrentDirectory())), targetFileName);
+        if (getStringComparer(!program.useCaseSensitiveFileNames())(pathToTargetFileWithExtension, sourceFile.fileName) === 0 /* EqualTo */)
+          return;
         const newModuleSpecifier = getModuleSpecifier(program.getCompilerOptions(), sourceFile, sourceFile.fileName, pathToTargetFileWithExtension, createModuleSpecifierResolutionHost(program, host));
         const newImportDeclaration = filterImport(importNode, makeStringLiteral(newModuleSpecifier, quotePreference), shouldMove);
         if (newImportDeclaration)
@@ -139955,7 +139958,7 @@ function createOldFileImportsFromTargetFile(sourceFile, targetFileNeedExport, ta
   return makeImportOrRequire(sourceFile, defaultImport, imports, targetFileNameWithExtension, program, host, useEs6Imports, quotePreference);
 }
 function makeImportOrRequire(sourceFile, defaultImport, imports, targetFileNameWithExtension, program, host, useEs6Imports, quotePreference) {
-  const pathToTargetFile = resolvePath(getDirectoryPath(sourceFile.path), targetFileNameWithExtension);
+  const pathToTargetFile = resolvePath(getDirectoryPath(getNormalizedAbsolutePath(sourceFile.fileName, program.getCurrentDirectory())), targetFileNameWithExtension);
   const pathToTargetFileWithCorrectExtension = getModuleSpecifier(program.getCompilerOptions(), sourceFile, sourceFile.fileName, pathToTargetFile, createModuleSpecifierResolutionHost(program, host));
   if (useEs6Imports) {
     const specifiers = imports.map((i) => factory.createImportSpecifier(

package/lib/typingsInstaller.js

@@ -53,16 +53,10 @@ module.exports = __toCommonJS(nodeTypingsInstaller_exports);
 var fs = __toESM(require("fs"));
 var path = __toESM(require("path"));
 
-// src/typingsInstaller/_namespaces/ts.ts
-var ts_exports = {};
-
 // src/typescript/typescript.ts
 var typescript_exports = {};
 __reExport(typescript_exports, require("./typescript.js"));
 
-// src/typingsInstaller/_namespaces/ts.ts
-__reExport(ts_exports, typescript_exports);
-
 // src/typingsInstaller/nodeTypingsInstaller.ts
 var FileLog = class {
   constructor(logFile) {
@@ -74,7 +68,7 @@ var FileLog = class {
       if (typeof this.logFile !== "string")
         return;
       try {
-        fs.appendFileSync(this.logFile, `[${ts_exports.server.nowString()}] ${text}${ts_exports.sys.newLine}`);
+        fs.appendFileSync(this.logFile, `[${typescript_exports.server.nowString()}] ${text}${typescript_exports.sys.newLine}`);
       } catch (e) {
         this.logFile = void 0;
       }
@@ -112,16 +106,16 @@ function loadTypesRegistryFile(typesRegistryFilePath, host, log2) {
 }
 var typesRegistryPackageName = "types-registry";
 function getTypesRegistryFileLocation(globalTypingsCacheLocation2) {
-  return (0, ts_exports.combinePaths)((0, ts_exports.normalizeSlashes)(globalTypingsCacheLocation2), `node_modules/${typesRegistryPackageName}/index.json`);
+  return (0, typescript_exports.combinePaths)((0, typescript_exports.normalizeSlashes)(globalTypingsCacheLocation2), `node_modules/${typesRegistryPackageName}/index.json`);
 }
-var NodeTypingsInstaller = class extends ts_exports.server.typingsInstaller.TypingsInstaller {
+var NodeTypingsInstaller = class extends typescript_exports.server.typingsInstaller.TypingsInstaller {
   constructor(globalTypingsCacheLocation2, typingSafeListLocation2, typesMapLocation2, npmLocation2, validateDefaultNpmLocation2, throttleLimit, log2) {
-    const libDirectory = (0, ts_exports.getDirectoryPath)((0, ts_exports.normalizePath)(ts_exports.sys.getExecutingFilePath()));
+    const libDirectory = (0, typescript_exports.getDirectoryPath)((0, typescript_exports.normalizePath)(typescript_exports.sys.getExecutingFilePath()));
     super(
-      ts_exports.sys,
+      typescript_exports.sys,
       globalTypingsCacheLocation2,
-      typingSafeListLocation2 ? (0, ts_exports.toPath)(typingSafeListLocation2, "", (0, ts_exports.createGetCanonicalFileName)(ts_exports.sys.useCaseSensitiveFileNames)) : (0, ts_exports.toPath)("typingSafeList.json", libDirectory, (0, ts_exports.createGetCanonicalFileName)(ts_exports.sys.useCaseSensitiveFileNames)),
-      typesMapLocation2 ? (0, ts_exports.toPath)(typesMapLocation2, "", (0, ts_exports.createGetCanonicalFileName)(ts_exports.sys.useCaseSensitiveFileNames)) : (0, ts_exports.toPath)("typesMap.json", libDirectory, (0, ts_exports.createGetCanonicalFileName)(ts_exports.sys.useCaseSensitiveFileNames)),
+      typingSafeListLocation2 ? (0, typescript_exports.toPath)(typingSafeListLocation2, "", (0, typescript_exports.createGetCanonicalFileName)(typescript_exports.sys.useCaseSensitiveFileNames)) : (0, typescript_exports.toPath)("typingSafeList.json", libDirectory, (0, typescript_exports.createGetCanonicalFileName)(typescript_exports.sys.useCaseSensitiveFileNames)),
+      typesMapLocation2 ? (0, typescript_exports.toPath)(typesMapLocation2, "", (0, typescript_exports.createGetCanonicalFileName)(typescript_exports.sys.useCaseSensitiveFileNames)) : (0, typescript_exports.toPath)("typesMap.json", libDirectory, (0, typescript_exports.createGetCanonicalFileName)(typescript_exports.sys.useCaseSensitiveFileNames)),
       throttleLimit,
       log2
     );
@@ -131,7 +125,7 @@ var NodeTypingsInstaller = class extends ts_exports.server.typingsInstaller.Typi
     }
     if (this.log.isEnabled()) {
       this.log.writeLine(`Process id: ${process.pid}`);
-      this.log.writeLine(`NPM location: ${this.npmPath} (explicit '${ts_exports.server.Arguments.NpmLocation}' ${npmLocation2 === void 0 ? "not " : ""} provided)`);
+      this.log.writeLine(`NPM location: ${this.npmPath} (explicit '${typescript_exports.server.Arguments.NpmLocation}' ${npmLocation2 === void 0 ? "not " : ""} provided)`);
       this.log.writeLine(`validateDefaultNpmLocation: ${validateDefaultNpmLocation2}`);
     }
     ({ execSync: this.nodeExecSync } = require("child_process"));
@@ -165,7 +159,7 @@ var NodeTypingsInstaller = class extends ts_exports.server.typingsInstaller.Typi
   }
   sendResponse(response) {
     if (this.log.isEnabled()) {
-      this.log.writeLine(`Sending response:${ts_exports.server.stringifyIndented(response)}`);
+      this.log.writeLine(`Sending response:${typescript_exports.server.stringifyIndented(response)}`);
     }
     process.send(response);
     if (this.log.isEnabled()) {
@@ -177,7 +171,7 @@ var NodeTypingsInstaller = class extends ts_exports.server.typingsInstaller.Typi
       this.log.writeLine(`#${requestId} with cwd: ${cwd} arguments: ${JSON.stringify(packageNames)}`);
     }
     const start = Date.now();
-    const hasError = ts_exports.server.typingsInstaller.installNpmPackages(this.npmPath, ts_exports.version, packageNames, (command) => this.execSyncAndLog(command, { cwd }));
+    const hasError = typescript_exports.server.typingsInstaller.installNpmPackages(this.npmPath, typescript_exports.version, packageNames, (command) => this.execSyncAndLog(command, { cwd }));
     if (this.log.isEnabled()) {
       this.log.writeLine(`npm install #${requestId} took: ${Date.now() - start} ms`);
     }
@@ -191,22 +185,22 @@ var NodeTypingsInstaller = class extends ts_exports.server.typingsInstaller.Typi
     try {
       const stdout = this.nodeExecSync(command, { ...options, encoding: "utf-8" });
       if (this.log.isEnabled()) {
-        this.log.writeLine(`    Succeeded. stdout:${indent(ts_exports.sys.newLine, stdout)}`);
+        this.log.writeLine(`    Succeeded. stdout:${indent(typescript_exports.sys.newLine, stdout)}`);
       }
       return false;
     } catch (error) {
       const { stdout, stderr } = error;
-      this.log.writeLine(`    Failed. stdout:${indent(ts_exports.sys.newLine, stdout)}${ts_exports.sys.newLine}    stderr:${indent(ts_exports.sys.newLine, stderr)}`);
+      this.log.writeLine(`    Failed. stdout:${indent(typescript_exports.sys.newLine, stdout)}${typescript_exports.sys.newLine}    stderr:${indent(typescript_exports.sys.newLine, stderr)}`);
       return true;
     }
   }
 };
-var logFilePath = ts_exports.server.findArgument(ts_exports.server.Arguments.LogFile);
-var globalTypingsCacheLocation = ts_exports.server.findArgument(ts_exports.server.Arguments.GlobalCacheLocation);
-var typingSafeListLocation = ts_exports.server.findArgument(ts_exports.server.Arguments.TypingSafeListLocation);
-var typesMapLocation = ts_exports.server.findArgument(ts_exports.server.Arguments.TypesMapLocation);
-var npmLocation = ts_exports.server.findArgument(ts_exports.server.Arguments.NpmLocation);
-var validateDefaultNpmLocation = ts_exports.server.hasArgument(ts_exports.server.Arguments.ValidateDefaultNpmLocation);
+var logFilePath = typescript_exports.server.findArgument(typescript_exports.server.Arguments.LogFile);
+var globalTypingsCacheLocation = typescript_exports.server.findArgument(typescript_exports.server.Arguments.GlobalCacheLocation);
+var typingSafeListLocation = typescript_exports.server.findArgument(typescript_exports.server.Arguments.TypingSafeListLocation);
+var typesMapLocation = typescript_exports.server.findArgument(typescript_exports.server.Arguments.TypesMapLocation);
+var npmLocation = typescript_exports.server.findArgument(typescript_exports.server.Arguments.NpmLocation);
+var validateDefaultNpmLocation = typescript_exports.server.hasArgument(typescript_exports.server.Arguments.ValidateDefaultNpmLocation);
 var log = new FileLog(logFilePath);
 if (log.isEnabled()) {
   process.on("uncaughtException", (e) => {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.5.0-pr-57681-18",
+  "version": "5.5.0-pr-57912-2",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -41,7 +41,7 @@
   "devDependencies": {
     "@esfx/canceltoken": "^1.0.0",
     "@octokit/rest": "^20.0.2",
-    "@types/chai": "^4.3.12",
+    "@types/chai": "^4.3.14",
     "@types/microsoft__typescript-etw": "^0.1.3",
     "@types/minimist": "^1.2.5",
     "@types/mocha": "^10.0.6",
@@ -49,23 +49,23 @@
     "@types/node": "latest",
     "@types/source-map-support": "^0.5.10",
     "@types/which": "^3.0.3",
-    "@typescript-eslint/eslint-plugin": "^7.1.1",
-    "@typescript-eslint/parser": "^7.1.1",
-    "@typescript-eslint/utils": "^7.1.1",
-    "azure-devops-node-api": "^12.4.0",
+    "@typescript-eslint/eslint-plugin": "^7.3.1",
+    "@typescript-eslint/parser": "^7.3.1",
+    "@typescript-eslint/utils": "^7.3.1",
+    "azure-devops-node-api": "^12.5.0",
     "c8": "^9.1.0",
     "chai": "^4.4.1",
     "chalk": "^4.1.2",
     "chokidar": "^3.6.0",
     "diff": "^5.2.0",
     "dprint": "^0.45.0",
-    "esbuild": "^0.20.1",
+    "esbuild": "^0.20.2",
     "eslint": "^8.57.0",
     "eslint-formatter-autolinkable-stylish": "^1.3.0",
     "eslint-plugin-local": "^4.2.1",
     "eslint-plugin-no-null": "^1.0.2",
     "eslint-plugin-simple-import-sort": "^12.0.0",
-    "fast-xml-parser": "^4.3.5",
+    "fast-xml-parser": "^4.3.6",
     "glob": "^10.3.10",
     "hereby": "^1.8.9",
     "jsonc-parser": "^3.2.1",
@@ -77,7 +77,7 @@
     "playwright": "^1.42.1",
     "source-map-support": "^0.5.21",
     "tslib": "^2.6.2",
-    "typescript": "^5.4.2",
+    "typescript": "^5.4.3",
     "which": "^3.0.1"
   },
   "overrides": {
@@ -113,5 +113,5 @@
     "node": "20.1.0",
     "npm": "8.19.4"
   },
-  "gitHead": "faa8f0448f6da0451f19eb0ce4da316513128cbb"
+  "gitHead": "3b12172f2371bf65ec4109aef8e1ee43c9a2d076"
 }