typescript 5.7.0-dev.20240903 → 5.7.0-dev.20240911

package/lib/typescript.js

@@ -259,6 +259,7 @@ __export(typescript_exports, {
   canWatchAffectingLocation: () => canWatchAffectingLocation,
   canWatchAtTypes: () => canWatchAtTypes,
   canWatchDirectoryOrFile: () => canWatchDirectoryOrFile,
+  canWatchDirectoryOrFilePath: () => canWatchDirectoryOrFilePath,
   cartesianProduct: () => cartesianProduct,
   cast: () => cast,
   chainBundle: () => chainBundle,
@@ -591,6 +592,7 @@ __export(typescript_exports, {
   forEach: () => forEach,
   forEachAncestor: () => forEachAncestor,
   forEachAncestorDirectory: () => forEachAncestorDirectory,
+  forEachAncestorDirectoryStoppingAtGlobalCache: () => forEachAncestorDirectoryStoppingAtGlobalCache,
   forEachChild: () => forEachChild,
   forEachChildRecursively: () => forEachChildRecursively,
   forEachEmittedFile: () => forEachEmittedFile,
@@ -1204,7 +1206,7 @@ __export(typescript_exports, {
   isBooleanLiteral: () => isBooleanLiteral,
   isBreakOrContinueStatement: () => isBreakOrContinueStatement,
   isBreakStatement: () => isBreakStatement,
-  isBuild: () => isBuild,
+  isBuildCommand: () => isBuildCommand,
   isBuildInfoFile: () => isBuildInfoFile,
   isBuilderProgram: () => isBuilderProgram,
   isBundle: () => isBundle,
@@ -2119,6 +2121,7 @@ __export(typescript_exports, {
   tagNamesAreEquivalent: () => tagNamesAreEquivalent,
   takeWhile: () => takeWhile,
   targetOptionDeclaration: () => targetOptionDeclaration,
+  targetToLibMap: () => targetToLibMap,
   testFormatSettings: () => testFormatSettings,
   textChangeRangeIsUnchanged: () => textChangeRangeIsUnchanged,
   textChangeRangeNewSpan: () => textChangeRangeNewSpan,
@@ -2212,6 +2215,7 @@ __export(typescript_exports, {
   tryRemoveExtension: () => tryRemoveExtension,
   tryRemovePrefix: () => tryRemovePrefix,
   tryRemoveSuffix: () => tryRemoveSuffix,
+  tscBuildOption: () => tscBuildOption,
   typeAcquisitionDeclarations: () => typeAcquisitionDeclarations,
   typeAliasNamePart: () => typeAliasNamePart,
   typeDirectiveIsEqualTo: () => typeDirectiveIsEqualTo,
@@ -2265,7 +2269,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.7";
-var version = `${versionMajorMinor}.0-dev.20240903`;
+var version = `${versionMajorMinor}.0-dev.20240911`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -14544,29 +14548,33 @@ function isExternalModuleNameRelative(moduleName) {
 function sortAndDeduplicateDiagnostics(diagnostics) {
   return sortAndDeduplicate(diagnostics, compareDiagnostics, diagnosticsEqualityComparer);
 }
+var targetToLibMap = /* @__PURE__ */ new Map([
+  [99 /* ESNext */, "lib.esnext.full.d.ts"],
+  [10 /* ES2023 */, "lib.es2023.full.d.ts"],
+  [9 /* ES2022 */, "lib.es2022.full.d.ts"],
+  [8 /* ES2021 */, "lib.es2021.full.d.ts"],
+  [7 /* ES2020 */, "lib.es2020.full.d.ts"],
+  [6 /* ES2019 */, "lib.es2019.full.d.ts"],
+  [5 /* ES2018 */, "lib.es2018.full.d.ts"],
+  [4 /* ES2017 */, "lib.es2017.full.d.ts"],
+  [3 /* ES2016 */, "lib.es2016.full.d.ts"],
+  [2 /* ES2015 */, "lib.es6.d.ts"]
+  // We don't use lib.es2015.full.d.ts due to breaking change.
+]);
 function getDefaultLibFileName(options) {
-  switch (getEmitScriptTarget(options)) {
+  const target = getEmitScriptTarget(options);
+  switch (target) {
     case 99 /* ESNext */:
-      return "lib.esnext.full.d.ts";
     case 10 /* ES2023 */:
-      return "lib.es2023.full.d.ts";
     case 9 /* ES2022 */:
-      return "lib.es2022.full.d.ts";
     case 8 /* ES2021 */:
-      return "lib.es2021.full.d.ts";
     case 7 /* ES2020 */:
-      return "lib.es2020.full.d.ts";
     case 6 /* ES2019 */:
-      return "lib.es2019.full.d.ts";
     case 5 /* ES2018 */:
-      return "lib.es2018.full.d.ts";
     case 4 /* ES2017 */:
-      return "lib.es2017.full.d.ts";
     case 3 /* ES2016 */:
-      return "lib.es2016.full.d.ts";
     case 2 /* ES2015 */:
-      return "lib.es6.d.ts";
-    // We don't use lib.es2015.full.d.ts due to breaking change.
+      return targetToLibMap.get(target);
     default:
       return "lib.d.ts";
   }
@@ -31277,23 +31285,21 @@ function hasRecordedExternalHelpers(sourceFile) {
 }
 function createExternalHelpersImportDeclarationIfNeeded(nodeFactory, helperFactory, sourceFile, compilerOptions, hasExportStarsToExportValues, hasImportStar, hasImportDefault) {
   if (compilerOptions.importHelpers && isEffectiveExternalModule(sourceFile, compilerOptions)) {
-    let namedBindings;
     const moduleKind = getEmitModuleKind(compilerOptions);
-    if (moduleKind >= 5 /* ES2015 */ && moduleKind <= 99 /* ESNext */ || getImpliedNodeFormatForEmitWorker(sourceFile, compilerOptions) === 99 /* ESNext */) {
-      const helpers = getEmitHelpers(sourceFile);
+    const impliedModuleKind = getImpliedNodeFormatForEmitWorker(sourceFile, compilerOptions);
+    const helpers = getImportedHelpers(sourceFile);
+    if (moduleKind >= 5 /* ES2015 */ && moduleKind <= 99 /* ESNext */ || impliedModuleKind === 99 /* ESNext */ || impliedModuleKind === void 0 && moduleKind === 200 /* Preserve */) {
       if (helpers) {
         const helperNames = [];
         for (const helper of helpers) {
-          if (!helper.scoped) {
-            const importName = helper.importName;
-            if (importName) {
-              pushIfUnique(helperNames, importName);
-            }
+          const importName = helper.importName;
+          if (importName) {
+            pushIfUnique(helperNames, importName);
           }
         }
         if (some(helperNames)) {
           helperNames.sort(compareStringsCaseSensitive);
-          namedBindings = nodeFactory.createNamedImports(
+          const namedBindings = nodeFactory.createNamedImports(
             map(helperNames, (name) => isFileLevelUniqueName(sourceFile, name) ? nodeFactory.createImportSpecifier(
               /*isTypeOnly*/
               false,
@@ -31310,57 +31316,54 @@ function createExternalHelpersImportDeclarationIfNeeded(nodeFactory, helperFacto
           const parseNode = getOriginalNode(sourceFile, isSourceFile);
           const emitNode = getOrCreateEmitNode(parseNode);
           emitNode.externalHelpers = true;
+          const externalHelpersImportDeclaration = nodeFactory.createImportDeclaration(
+            /*modifiers*/
+            void 0,
+            nodeFactory.createImportClause(
+              /*isTypeOnly*/
+              false,
+              /*name*/
+              void 0,
+              namedBindings
+            ),
+            nodeFactory.createStringLiteral(externalHelpersModuleNameText),
+            /*attributes*/
+            void 0
+          );
+          addInternalEmitFlags(externalHelpersImportDeclaration, 2 /* NeverApplyImportHelper */);
+          return externalHelpersImportDeclaration;
         }
       }
     } else {
-      const externalHelpersModuleName = getOrCreateExternalHelpersModuleNameIfNeeded(nodeFactory, sourceFile, compilerOptions, hasExportStarsToExportValues, hasImportStar || hasImportDefault);
+      const externalHelpersModuleName = getOrCreateExternalHelpersModuleNameIfNeeded(nodeFactory, sourceFile, compilerOptions, helpers, hasExportStarsToExportValues, hasImportStar || hasImportDefault);
       if (externalHelpersModuleName) {
-        namedBindings = nodeFactory.createNamespaceImport(externalHelpersModuleName);
-      }
-    }
-    if (namedBindings) {
-      const externalHelpersImportDeclaration = nodeFactory.createImportDeclaration(
-        /*modifiers*/
-        void 0,
-        nodeFactory.createImportClause(
+        const externalHelpersImportDeclaration = nodeFactory.createImportEqualsDeclaration(
+          /*modifiers*/
+          void 0,
           /*isTypeOnly*/
           false,
-          /*name*/
-          void 0,
-          namedBindings
-        ),
-        nodeFactory.createStringLiteral(externalHelpersModuleNameText),
-        /*attributes*/
-        void 0
-      );
-      addInternalEmitFlags(externalHelpersImportDeclaration, 2 /* NeverApplyImportHelper */);
-      return externalHelpersImportDeclaration;
+          externalHelpersModuleName,
+          nodeFactory.createExternalModuleReference(nodeFactory.createStringLiteral(externalHelpersModuleNameText))
+        );
+        addInternalEmitFlags(externalHelpersImportDeclaration, 2 /* NeverApplyImportHelper */);
+        return externalHelpersImportDeclaration;
+      }
     }
   }
 }
-function getOrCreateExternalHelpersModuleNameIfNeeded(factory2, node, compilerOptions, hasExportStarsToExportValues, hasImportStarOrImportDefault) {
-  if (compilerOptions.importHelpers && isEffectiveExternalModule(node, compilerOptions)) {
-    const externalHelpersModuleName = getExternalHelpersModuleName(node);
-    if (externalHelpersModuleName) {
-      return externalHelpersModuleName;
-    }
-    let create = (hasExportStarsToExportValues || getESModuleInterop(compilerOptions) && hasImportStarOrImportDefault) && getEmitModuleFormatOfFileWorker(node, compilerOptions) < 4 /* System */;
-    if (!create) {
-      const helpers = getEmitHelpers(node);
-      if (helpers) {
-        for (const helper of helpers) {
-          if (!helper.scoped) {
-            create = true;
-            break;
-          }
-        }
-      }
-    }
-    if (create) {
-      const parseNode = getOriginalNode(node, isSourceFile);
-      const emitNode = getOrCreateEmitNode(parseNode);
-      return emitNode.externalHelpersModuleName || (emitNode.externalHelpersModuleName = factory2.createUniqueName(externalHelpersModuleNameText));
-    }
+function getImportedHelpers(sourceFile) {
+  return filter(getEmitHelpers(sourceFile), (helper) => !helper.scoped);
+}
+function getOrCreateExternalHelpersModuleNameIfNeeded(factory2, node, compilerOptions, helpers, hasExportStarsToExportValues, hasImportStarOrImportDefault) {
+  const externalHelpersModuleName = getExternalHelpersModuleName(node);
+  if (externalHelpersModuleName) {
+    return externalHelpersModuleName;
+  }
+  const create = some(helpers) || (hasExportStarsToExportValues || getESModuleInterop(compilerOptions) && hasImportStarOrImportDefault) && getEmitModuleFormatOfFileWorker(node, compilerOptions) < 4 /* System */;
+  if (create) {
+    const parseNode = getOriginalNode(node, isSourceFile);
+    const emitNode = getOrCreateEmitNode(parseNode);
+    return emitNode.externalHelpersModuleName || (emitNode.externalHelpersModuleName = factory2.createUniqueName(externalHelpersModuleNameText));
   }
 }
 function getLocalNameForExternalImport(factory2, node, sourceFile) {
@@ -40537,15 +40540,6 @@ var commandOptionsWithoutBuild = [
     paramType: Diagnostics.FILE_OR_DIRECTORY,
     description: Diagnostics.Compile_the_project_given_the_path_to_its_configuration_file_or_to_a_folder_with_a_tsconfig_json
   },
-  {
-    name: "build",
-    type: "boolean",
-    shortName: "b",
-    showInSimplifiedHelpView: true,
-    category: Diagnostics.Command_line_Options,
-    description: Diagnostics.Build_one_or_more_projects_and_their_dependencies_if_out_of_date,
-    defaultValueDescription: false
-  },
   {
     name: "showConfig",
     type: "boolean",
@@ -41530,7 +41524,17 @@ var commandLineOptionOfCustomType = optionDeclarations.filter(isCommandLineOptio
 function isCommandLineOptionOfCustomType(option) {
   return !isString(option.type);
 }
+var tscBuildOption = {
+  name: "build",
+  type: "boolean",
+  shortName: "b",
+  showInSimplifiedHelpView: true,
+  category: Diagnostics.Command_line_Options,
+  description: Diagnostics.Build_one_or_more_projects_and_their_dependencies_if_out_of_date,
+  defaultValueDescription: false
+};
 var optionsForBuild = [
+  tscBuildOption,
   {
     name: "verbose",
     shortName: "v",
@@ -41669,8 +41673,14 @@ function getOptionName(option) {
 }
 function createUnknownOptionError(unknownOption, diagnostics, unknownOptionErrorText, node, sourceFile) {
   var _a;
-  if ((_a = diagnostics.alternateMode) == null ? void 0 : _a.getOptionsNameMap().optionsNameMap.has(unknownOption.toLowerCase())) {
-    return createDiagnosticForNodeInSourceFileOrCompilerDiagnostic(sourceFile, node, diagnostics.alternateMode.diagnostic, unknownOption);
+  const otherOption = (_a = diagnostics.alternateMode) == null ? void 0 : _a.getOptionsNameMap().optionsNameMap.get(unknownOption.toLowerCase());
+  if (otherOption) {
+    return createDiagnosticForNodeInSourceFileOrCompilerDiagnostic(
+      sourceFile,
+      node,
+      otherOption !== tscBuildOption ? diagnostics.alternateMode.diagnostic : Diagnostics.Option_build_must_be_the_first_command_line_argument,
+      unknownOption
+    );
   }
   const possibleOption = getSpellingSuggestion(unknownOption, diagnostics.optionDeclarations, getOptionName);
   return possibleOption ? createDiagnosticForNodeInSourceFileOrCompilerDiagnostic(sourceFile, node, diagnostics.unknownDidYouMeanDiagnostic, unknownOptionErrorText || unknownOption, possibleOption.name) : createDiagnosticForNodeInSourceFileOrCompilerDiagnostic(sourceFile, node, diagnostics.unknownOptionDiagnostic, unknownOptionErrorText || unknownOption);
@@ -41859,10 +41869,10 @@ var buildOptionsDidYouMeanDiagnostics = {
   unknownDidYouMeanDiagnostic: Diagnostics.Unknown_build_option_0_Did_you_mean_1,
   optionTypeMismatchDiagnostic: Diagnostics.Build_option_0_requires_a_value_of_type_1
 };
-function parseBuildCommand(args) {
+function parseBuildCommand(commandLine) {
   const { options, watchOptions, fileNames: projects, errors } = parseCommandLineWorker(
     buildOptionsDidYouMeanDiagnostics,
-    args
+    commandLine
   );
   const buildOptions = options;
   if (projects.length === 0) {
@@ -42805,7 +42815,7 @@ function parseConfig(json, sourceFile, host, basePath, configFileName, resolutio
     if (ownConfig.raw.compileOnSave === void 0 && result.compileOnSave) ownConfig.raw.compileOnSave = result.compileOnSave;
     if (sourceFile && result.extendedSourceFiles) sourceFile.extendedSourceFiles = arrayFrom(result.extendedSourceFiles.keys());
     ownConfig.options = assign(result.options, ownConfig.options);
-    ownConfig.watchOptions = ownConfig.watchOptions && result.watchOptions ? assign(result.watchOptions, ownConfig.watchOptions) : ownConfig.watchOptions || result.watchOptions;
+    ownConfig.watchOptions = ownConfig.watchOptions && result.watchOptions ? assignWatchOptions(result, ownConfig.watchOptions) : ownConfig.watchOptions || result.watchOptions;
   }
   return ownConfig;
   function applyExtendedConfig(result, extendedConfigPath) {
@@ -42829,9 +42839,14 @@ function parseConfig(json, sourceFile, host, basePath, configFileName, resolutio
         result.compileOnSave = extendsRaw.compileOnSave;
       }
       assign(result.options, extendedConfig.options);
-      result.watchOptions = result.watchOptions && extendedConfig.watchOptions ? assign({}, result.watchOptions, extendedConfig.watchOptions) : result.watchOptions || extendedConfig.watchOptions;
+      result.watchOptions = result.watchOptions && extendedConfig.watchOptions ? assignWatchOptions(result, extendedConfig.watchOptions) : result.watchOptions || extendedConfig.watchOptions;
     }
   }
+  function assignWatchOptions(result, watchOptions) {
+    if (result.watchOptionsCopied) return assign(result.watchOptions, watchOptions);
+    result.watchOptionsCopied = true;
+    return assign({}, result.watchOptions, watchOptions);
+  }
 }
 function parseOwnConfigOfJson(json, host, basePath, configFileName, errors) {
   if (hasProperty(json, "excludes")) {
@@ -43874,7 +43889,7 @@ function getConditions(options, resolutionMode) {
 }
 function resolvePackageNameToPackageJson(packageName, containingDirectory, options, host, cache) {
   const moduleResolutionState = getTemporaryModuleResolutionState(cache == null ? void 0 : cache.getPackageJsonInfoCache(), host, options);
-  return forEachAncestorDirectory(containingDirectory, (ancestorDirectory) => {
+  return forEachAncestorDirectoryStoppingAtGlobalCache(host, containingDirectory, (ancestorDirectory) => {
     if (getBaseFileName(ancestorDirectory) !== "node_modules") {
       const nodeModulesFolder = combinePaths(ancestorDirectory, "node_modules");
       const candidate = combinePaths(nodeModulesFolder, packageName);
@@ -45006,7 +45021,8 @@ function getTemporaryModuleResolutionState(packageJsonInfoCache, host, options)
   };
 }
 function getPackageScopeForPath(directory, state) {
-  return forEachAncestorDirectory(
+  return forEachAncestorDirectoryStoppingAtGlobalCache(
+    state.host,
     directory,
     (dir) => getPackageJsonInfo(
       dir,
@@ -45645,17 +45661,30 @@ function loadModuleFromNearestNodeModulesDirectoryWorker(extensions, moduleName,
     return lookup(secondaryExtensions);
   }
   function lookup(extensions2) {
-    return forEachAncestorDirectory(normalizeSlashes(directory), (ancestorDirectory) => {
-      if (getBaseFileName(ancestorDirectory) !== "node_modules") {
-        const resolutionFromCache = tryFindNonRelativeModuleNameInCache(cache, moduleName, mode, ancestorDirectory, redirectedReference, state);
-        if (resolutionFromCache) {
-          return resolutionFromCache;
+    return forEachAncestorDirectoryStoppingAtGlobalCache(
+      state.host,
+      normalizeSlashes(directory),
+      (ancestorDirectory) => {
+        if (getBaseFileName(ancestorDirectory) !== "node_modules") {
+          const resolutionFromCache = tryFindNonRelativeModuleNameInCache(cache, moduleName, mode, ancestorDirectory, redirectedReference, state);
+          if (resolutionFromCache) {
+            return resolutionFromCache;
+          }
+          return toSearchResult(loadModuleFromImmediateNodeModulesDirectory(extensions2, moduleName, ancestorDirectory, state, typesScopeOnly, cache, redirectedReference));
         }
-        return toSearchResult(loadModuleFromImmediateNodeModulesDirectory(extensions2, moduleName, ancestorDirectory, state, typesScopeOnly, cache, redirectedReference));
       }
-    });
+    );
   }
 }
+function forEachAncestorDirectoryStoppingAtGlobalCache(host, directory, callback) {
+  var _a;
+  const globalCache = (_a = host == null ? void 0 : host.getGlobalTypingsCacheLocation) == null ? void 0 : _a.call(host);
+  return forEachAncestorDirectory(directory, (ancestorDirectory) => {
+    const result = callback(ancestorDirectory);
+    if (result !== void 0) return result;
+    if (ancestorDirectory === globalCache) return false;
+  }) || void 0;
+}
 function loadModuleFromImmediateNodeModulesDirectory(extensions, moduleName, directory, state, typesScopeOnly, cache, redirectedReference) {
   const nodeModulesFolder = combinePaths(directory, "node_modules");
   const nodeModulesFolderExists = directoryProbablyExists(nodeModulesFolder, state.host);
@@ -45851,28 +45880,32 @@ function classicNameResolver(moduleName, containingFile, compilerOptions, host,
       return { value: resolvedUsingSettings };
     }
     if (!isExternalModuleNameRelative(moduleName)) {
-      const resolved2 = forEachAncestorDirectory(containingDirectory, (directory) => {
-        const resolutionFromCache = tryFindNonRelativeModuleNameInCache(
-          cache,
-          moduleName,
-          /*mode*/
-          void 0,
-          directory,
-          redirectedReference,
-          state
-        );
-        if (resolutionFromCache) {
-          return resolutionFromCache;
+      const resolved2 = forEachAncestorDirectoryStoppingAtGlobalCache(
+        state.host,
+        containingDirectory,
+        (directory) => {
+          const resolutionFromCache = tryFindNonRelativeModuleNameInCache(
+            cache,
+            moduleName,
+            /*mode*/
+            void 0,
+            directory,
+            redirectedReference,
+            state
+          );
+          if (resolutionFromCache) {
+            return resolutionFromCache;
+          }
+          const searchName = normalizePath(combinePaths(directory, moduleName));
+          return toSearchResult(loadModuleFromFileNoPackageId(
+            extensions,
+            searchName,
+            /*onlyRecordFailures*/
+            false,
+            state
+          ));
         }
-        const searchName = normalizePath(combinePaths(directory, moduleName));
-        return toSearchResult(loadModuleFromFileNoPackageId(
-          extensions,
-          searchName,
-          /*onlyRecordFailures*/
-          false,
-          state
-        ));
-      });
+      );
       if (resolved2) return resolved2;
       if (extensions & (1 /* TypeScript */ | 4 /* Declaration */)) {
         let resolved3 = loadModuleFromNearestNodeModulesDirectoryTypesScope(moduleName, containingDirectory, state);
@@ -49497,9 +49530,11 @@ function getNearestAncestorDirectoryWithPackageJson(host, fileName) {
   if (host.getNearestAncestorDirectoryWithPackageJson) {
     return host.getNearestAncestorDirectoryWithPackageJson(fileName);
   }
-  return forEachAncestorDirectory(fileName, (directory) => {
-    return host.fileExists(combinePaths(directory, "package.json")) ? directory : void 0;
-  });
+  return forEachAncestorDirectoryStoppingAtGlobalCache(
+    host,
+    fileName,
+    (directory) => host.fileExists(combinePaths(directory, "package.json")) ? directory : void 0
+  );
 }
 function forEachFileNameOfModule(importingFileName, importedFileName, host, preferSymlinks, cb) {
   var _a;
@@ -49517,25 +49552,29 @@ function forEachFileNameOfModule(importingFileName, importedFileName, host, pref
   }
   const symlinkedDirectories = (_a = host.getSymlinkCache) == null ? void 0 : _a.call(host).getSymlinkedDirectoriesByRealpath();
   const fullImportedFileName = getNormalizedAbsolutePath(importedFileName, cwd);
-  const result = symlinkedDirectories && forEachAncestorDirectory(getDirectoryPath(fullImportedFileName), (realPathDirectory) => {
-    const symlinkDirectories = symlinkedDirectories.get(ensureTrailingDirectorySeparator(toPath(realPathDirectory, cwd, getCanonicalFileName)));
-    if (!symlinkDirectories) return void 0;
-    if (startsWithDirectory(importingFileName, realPathDirectory, getCanonicalFileName)) {
-      return false;
-    }
-    return forEach(targets, (target) => {
-      if (!startsWithDirectory(target, realPathDirectory, getCanonicalFileName)) {
-        return;
-      }
-      const relative = getRelativePathFromDirectory(realPathDirectory, target, getCanonicalFileName);
-      for (const symlinkDirectory of symlinkDirectories) {
-        const option = resolvePath(symlinkDirectory, relative);
-        const result2 = cb(option, target === referenceRedirect);
-        shouldFilterIgnoredPaths = true;
-        if (result2) return result2;
+  const result = symlinkedDirectories && forEachAncestorDirectoryStoppingAtGlobalCache(
+    host,
+    getDirectoryPath(fullImportedFileName),
+    (realPathDirectory) => {
+      const symlinkDirectories = symlinkedDirectories.get(ensureTrailingDirectorySeparator(toPath(realPathDirectory, cwd, getCanonicalFileName)));
+      if (!symlinkDirectories) return void 0;
+      if (startsWithDirectory(importingFileName, realPathDirectory, getCanonicalFileName)) {
+        return false;
       }
-    });
-  });
+      return forEach(targets, (target) => {
+        if (!startsWithDirectory(target, realPathDirectory, getCanonicalFileName)) {
+          return;
+        }
+        const relative = getRelativePathFromDirectory(realPathDirectory, target, getCanonicalFileName);
+        for (const symlinkDirectory of symlinkDirectories) {
+          const option = resolvePath(symlinkDirectory, relative);
+          const result2 = cb(option, target === referenceRedirect);
+          shouldFilterIgnoredPaths = true;
+          if (result2) return result2;
+        }
+      });
+    }
+  );
   return result || (preferSymlinks ? forEach(targets, (p) => shouldFilterIgnoredPaths && containsIgnoredPath(p) ? void 0 : cb(p, p === referenceRedirect)) : void 0);
 }
 function getAllModulePaths(info, importedFileName, host, preferences, compilerOptions, options = {}) {
@@ -84180,7 +84219,7 @@ function createTypeChecker(host) {
       const modifiers = getTypeParameterModifiers(typeParameter) & (8192 /* In */ | 16384 /* Out */);
       if (modifiers) {
         const symbol = getSymbolOfDeclaration(node.parent);
-        if (isTypeAliasDeclaration(node.parent) && !(getObjectFlags(getDeclaredTypeOfSymbol(symbol)) & (4 /* Reference */ | 16 /* Anonymous */ | 32 /* Mapped */))) {
+        if (isTypeAliasDeclaration(node.parent) && !(getObjectFlags(getDeclaredTypeOfSymbol(symbol)) & (16 /* Anonymous */ | 32 /* Mapped */))) {
           error2(node, Diagnostics.Variance_annotations_are_only_supported_in_type_aliases_for_object_function_constructor_and_mapped_types);
         } else if (modifiers === 8192 /* In */ || modifiers === 16384 /* Out */) {
           (_a = tracing) == null ? void 0 : _a.push(tracing.Phase.CheckTypes, "checkTypeParameterDeferred", { parent: getTypeId(getDeclaredTypeOfSymbol(symbol)), id: getTypeId(typeParameter) });
@@ -93324,7 +93363,8 @@ function createBasicNodeBuilderModuleSpecifierResolutionHost(host) {
     getFileIncludeReasons: () => host.getFileIncludeReasons(),
     readFile: host.readFile ? (fileName) => host.readFile(fileName) : void 0,
     getDefaultResolutionModeForFile: (file) => host.getDefaultResolutionModeForFile(file),
-    getModeForResolutionAtIndex: (file, index) => host.getModeForResolutionAtIndex(file, index)
+    getModeForResolutionAtIndex: (file, index) => host.getModeForResolutionAtIndex(file, index),
+    getGlobalTypingsCacheLocation: maybeBind(host, host.getGlobalTypingsCacheLocation)
   };
 }
 var SymbolTrackerImpl = class _SymbolTrackerImpl {
@@ -115915,6 +115955,7 @@ function transformECMAScriptModule(context) {
   context.onSubstituteNode = onSubstituteNode;
   context.enableEmitNotification(307 /* SourceFile */);
   context.enableSubstitution(80 /* Identifier */);
+  const noSubstitution = /* @__PURE__ */ new Set();
   let helperNameSubstitutions;
   let currentSourceFile;
   let importRequireStatements;
@@ -115949,7 +115990,7 @@ function transformECMAScriptModule(context) {
     if (externalHelpersImportDeclaration) {
       const statements = [];
       const statementOffset = factory2.copyPrologue(node.statements, statements);
-      append(statements, externalHelpersImportDeclaration);
+      addRange(statements, visitArray([externalHelpersImportDeclaration], visitor, isStatement));
       addRange(statements, visitNodes2(node.statements, visitor, isStatement, statementOffset));
       return factory2.updateSourceFile(
         node,
@@ -116164,7 +116205,9 @@ function transformECMAScriptModule(context) {
       if ((isExternalModule(node) || getIsolatedModules(compilerOptions)) && compilerOptions.importHelpers) {
         helperNameSubstitutions = /* @__PURE__ */ new Map();
       }
+      currentSourceFile = node;
       previousOnEmitNode(hint, node, emitCallback);
+      currentSourceFile = void 0;
       helperNameSubstitutions = void 0;
     } else {
       previousOnEmitNode(hint, node, emitCallback);
@@ -116172,18 +116215,29 @@ function transformECMAScriptModule(context) {
   }
   function onSubstituteNode(hint, node) {
     node = previousOnSubstituteNode(hint, node);
-    if (helperNameSubstitutions && isIdentifier(node) && getEmitFlags(node) & 8192 /* HelperName */) {
+    if (node.id && noSubstitution.has(node.id)) {
+      return node;
+    }
+    if (isIdentifier(node) && getEmitFlags(node) & 8192 /* HelperName */) {
       return substituteHelperName(node);
     }
     return node;
   }
   function substituteHelperName(node) {
-    const name = idText(node);
-    let substitution = helperNameSubstitutions.get(name);
-    if (!substitution) {
-      helperNameSubstitutions.set(name, substitution = factory2.createUniqueName(name, 16 /* Optimistic */ | 32 /* FileLevel */));
+    const externalHelpersModuleName = currentSourceFile && getExternalHelpersModuleName(currentSourceFile);
+    if (externalHelpersModuleName) {
+      noSubstitution.add(getNodeId(node));
+      return factory2.createPropertyAccessExpression(externalHelpersModuleName, node);
+    }
+    if (helperNameSubstitutions) {
+      const name = idText(node);
+      let substitution = helperNameSubstitutions.get(name);
+      if (!substitution) {
+        helperNameSubstitutions.set(name, substitution = factory2.createUniqueName(name, 16 /* Optimistic */ | 32 /* FileLevel */));
+      }
+      return substitution;
     }
-    return substitution;
+    return node;
   }
 }
 
@@ -125503,7 +125557,8 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     getCanonicalFileName,
     getFileIncludeReasons: () => fileReasons,
     structureIsReused,
-    writeFile: writeFile2
+    writeFile: writeFile2,
+    getGlobalTypingsCacheLocation: maybeBind(host, host.getGlobalTypingsCacheLocation)
   };
   onProgramCreateComplete();
   verifyCompilerOptions();
@@ -126069,7 +126124,8 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
       getFileIncludeReasons: program.getFileIncludeReasons,
       createHash: maybeBind(host, host.createHash),
       getModuleResolutionCache: () => program.getModuleResolutionCache(),
-      trace: maybeBind(host, host.trace)
+      trace: maybeBind(host, host.trace),
+      getGlobalTypingsCacheLocation: program.getGlobalTypingsCacheLocation
     };
   }
   function writeFile2(fileName, text, writeByteOrderMark, onError, sourceFiles, data) {
@@ -130436,6 +130492,9 @@ function canWatchDirectoryOrFile(pathComponents2, length2) {
   const perceivedOsRootLength = perceivedOsRootLengthForWatching(pathComponents2, length2);
   return length2 > perceivedOsRootLength + 1;
 }
+function canWatchDirectoryOrFilePath(path) {
+  return canWatchDirectoryOrFile(getPathComponents(path));
+}
 function canWatchAtTypes(atTypes) {
   return canWatchAffectedPackageJsonOrNodeModulesOfAtTypes(getDirectoryPath(atTypes));
 }
@@ -130447,12 +130506,12 @@ function isInDirectoryPath(dirComponents, fileOrDirComponents) {
   return true;
 }
 function canWatchAffectedPackageJsonOrNodeModulesOfAtTypes(fileOrDirPath) {
-  return canWatchDirectoryOrFile(getPathComponents(fileOrDirPath));
+  return canWatchDirectoryOrFilePath(fileOrDirPath);
 }
 function canWatchAffectingLocation(filePath) {
   return canWatchAffectedPackageJsonOrNodeModulesOfAtTypes(filePath);
 }
-function getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLookupLocationPath, rootDir, rootPath, rootPathComponents, getCurrentDirectory, preferNonRecursiveWatch) {
+function getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLookupLocationPath, rootDir, rootPath, rootPathComponents, isRootWatchable, getCurrentDirectory, preferNonRecursiveWatch) {
   const failedLookupPathComponents = getPathComponents(failedLookupLocationPath);
   failedLookupLocation = isRootedDiskPath(failedLookupLocation) ? normalizePath(failedLookupLocation) : getNormalizedAbsolutePath(failedLookupLocation, getCurrentDirectory());
   const failedLookupComponents = getPathComponents(failedLookupLocation);
@@ -130461,7 +130520,7 @@ function getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLoo
   const nodeModulesIndex = failedLookupPathComponents.indexOf("node_modules");
   if (nodeModulesIndex !== -1 && nodeModulesIndex + 1 <= perceivedOsRootLength + 1) return void 0;
   const lastNodeModulesIndex = failedLookupPathComponents.lastIndexOf("node_modules");
-  if (isInDirectoryPath(rootPathComponents, failedLookupPathComponents)) {
+  if (isRootWatchable && isInDirectoryPath(rootPathComponents, failedLookupPathComponents)) {
     if (failedLookupPathComponents.length > rootPathComponents.length + 1) {
       return getDirectoryOfFailedLookupWatch(
         failedLookupComponents,
@@ -130533,9 +130592,9 @@ function getDirectoryOfFailedLookupWatch(dirComponents, dirPathComponents, lengt
     packageDirPath: packageDirLength !== void 0 ? getPathFromPathComponents(dirPathComponents, packageDirLength) : void 0
   };
 }
-function getDirectoryToWatchFailedLookupLocationFromTypeRoot(typeRoot, typeRootPath, rootPath, rootPathComponents, getCurrentDirectory, preferNonRecursiveWatch, filterCustomPath) {
+function getDirectoryToWatchFailedLookupLocationFromTypeRoot(typeRoot, typeRootPath, rootPath, rootPathComponents, isRootWatchable, getCurrentDirectory, preferNonRecursiveWatch, filterCustomPath) {
   const typeRootPathComponents = getPathComponents(typeRootPath);
-  if (isInDirectoryPath(rootPathComponents, typeRootPathComponents)) {
+  if (isRootWatchable && isInDirectoryPath(rootPathComponents, typeRootPathComponents)) {
     return rootPath;
   }
   typeRoot = isRootedDiskPath(typeRoot) ? normalizePath(typeRoot) : getNormalizedAbsolutePath(typeRoot, getCurrentDirectory());
@@ -130576,10 +130635,10 @@ function createModuleResolutionLoaderUsingGlobalCache(containingFile, redirected
 function resolveModuleNameUsingGlobalCache(resolutionHost, moduleResolutionCache, moduleName, containingFile, compilerOptions, redirectedReference, mode) {
   const host = getModuleResolutionHost(resolutionHost);
   const primaryResult = resolveModuleName(moduleName, containingFile, compilerOptions, host, moduleResolutionCache, redirectedReference, mode);
-  if (!resolutionHost.getGlobalCache) {
+  if (!resolutionHost.getGlobalTypingsCacheLocation) {
     return primaryResult;
   }
-  const globalCache = resolutionHost.getGlobalCache();
+  const globalCache = resolutionHost.getGlobalTypingsCacheLocation();
   if (globalCache !== void 0 && !isExternalModuleNameRelative(moduleName) && !(primaryResult.resolvedModule && extensionIsTS(primaryResult.resolvedModule.extension))) {
     const { resolvedModule, failedLookupLocations, affectingLocations, resolutionDiagnostics } = loadModuleFromGlobalCache(
       Debug.checkDefined(resolutionHost.globalCacheResolutionModuleName)(moduleName),
@@ -130643,6 +130702,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   const rootDir = getRootDirectoryOfResolutionCache(rootDirForResolution, getCurrentDirectory);
   const rootPath = resolutionHost.toPath(rootDir);
   const rootPathComponents = getPathComponents(rootPath);
+  const isRootWatchable = canWatchDirectoryOrFile(rootPathComponents);
   const isSymlinkCache = /* @__PURE__ */ new Map();
   const packageDirWatchers = /* @__PURE__ */ new Map();
   const dirPathToSymlinkPackageRefCount = /* @__PURE__ */ new Map();
@@ -131054,6 +131114,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       rootDir,
       rootPath,
       rootPathComponents,
+      isRootWatchable,
       getCurrentDirectory,
       resolutionHost.preferNonRecursiveWatch
     );
@@ -131242,6 +131303,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       rootDir,
       rootPath,
       rootPathComponents,
+      isRootWatchable,
       getCurrentDirectory,
       resolutionHost.preferNonRecursiveWatch
     );
@@ -131385,6 +131447,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
           return false;
         }
         (failedLookupChecks || (failedLookupChecks = /* @__PURE__ */ new Set())).add(fileOrDirectoryPath);
+        (startsWithPathChecks || (startsWithPathChecks = /* @__PURE__ */ new Set())).add(fileOrDirectoryPath);
         const packagePath = parseNodeModuleFromPath(
           fileOrDirectoryPath,
           /*isFolder*/
@@ -131466,6 +131529,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
         resolutionHost.toPath(typeRoot),
         rootPath,
         rootPathComponents,
+        isRootWatchable,
         getCurrentDirectory,
         resolutionHost.preferNonRecursiveWatch,
         (dirPath2) => directoryWatchesOfFailedLookups.has(dirPath2) || dirPathToSymlinkPackageRefCount.has(dirPath2)
@@ -132223,6 +132287,7 @@ function createWatchProgram(host) {
   let updateLevel;
   let missingFilesMap;
   let watchedWildcardDirectories;
+  let staleWatches = /* @__PURE__ */ new Map([[void 0, void 0]]);
   let timerToUpdateProgram;
   let timerToInvalidateFailedLookupResolutions;
   let parsedConfigs;
@@ -132311,8 +132376,6 @@ function createWatchProgram(host) {
   const customHasInvalidLibResolutions = host.resolveLibrary ? maybeBind(host, host.hasInvalidatedLibResolutions) || returnTrue : returnFalse;
   builderProgram = readBuilderProgram(compilerOptions, compilerHost);
   synchronizeProgram();
-  watchConfigFileWildCardDirectories();
-  if (configFileName) updateExtendedConfigFilesWatches(toPath3(configFileName), compilerOptions, watchOptions, WatchType.ExtendedConfigFile);
   return configFileName ? { getCurrentProgram: getCurrentBuilderProgram, getProgram: updateProgram, close, getResolutionCache } : { getCurrentProgram: getCurrentBuilderProgram, getProgram: updateProgram, updateRootFileNames, close, getResolutionCache };
   function close() {
     clearInvalidateResolutionsOfFailedLookupLocations();
@@ -132415,6 +132478,16 @@ function createWatchProgram(host) {
     compilerHost.directoryExists = originalDirectoryExists;
     compilerHost.createDirectory = originalCreateDirectory;
     compilerHost.writeFile = originalWriteFile;
+    staleWatches == null ? void 0 : staleWatches.forEach((configFile, configPath) => {
+      if (!configPath) {
+        watchConfigFileWildCardDirectories();
+        if (configFileName) updateExtendedConfigFilesWatches(toPath3(configFileName), compilerOptions, watchOptions, WatchType.ExtendedConfigFile);
+      } else {
+        const config = parsedConfigs == null ? void 0 : parsedConfigs.get(configPath);
+        if (config) watchReferencedProject(configFile, configPath, config);
+      }
+    });
+    staleWatches = void 0;
     return builderProgram;
   }
   function createNewProgram(hasInvalidatedResolutions, hasInvalidatedLibResolutions) {
@@ -132621,9 +132694,8 @@ function createWatchProgram(host) {
     }
     parseConfigFile2();
     hasChangedCompilerOptions = true;
+    (staleWatches ?? (staleWatches = /* @__PURE__ */ new Map())).set(void 0, void 0);
     synchronizeProgram();
-    watchConfigFileWildCardDirectories();
-    updateExtendedConfigFilesWatches(toPath3(configFileName), compilerOptions, watchOptions, WatchType.ExtendedConfigFile);
   }
   function parseConfigFile2() {
     Debug.assert(configFileName);
@@ -132675,7 +132747,7 @@ function createWatchProgram(host) {
     } else {
       (parsedConfigs || (parsedConfigs = /* @__PURE__ */ new Map())).set(configPath, config = { parsedCommandLine });
     }
-    watchReferencedProject(configFileName2, configPath, config);
+    (staleWatches ?? (staleWatches = /* @__PURE__ */ new Map())).set(configPath, configFileName2);
     return parsedCommandLine;
   }
   function getParsedCommandLineFromConfigFileHost(configFileName2) {
@@ -134692,7 +134764,7 @@ function shouldBePretty(sys2, options) {
   return options.pretty;
 }
 function getOptionsForHelp(commandLine) {
-  return !!commandLine.options.all ? toSorted(optionDeclarations, (a, b) => compareStringsCaseInsensitive(a.name, b.name)) : filter(optionDeclarations.slice(), (v) => !!v.showInSimplifiedHelpView);
+  return !!commandLine.options.all ? toSorted(optionDeclarations.concat(tscBuildOption), (a, b) => compareStringsCaseInsensitive(a.name, b.name)) : filter(optionDeclarations.concat(tscBuildOption), (v) => !!v.showInSimplifiedHelpView);
 }
 function printVersion(sys2) {
   sys2.write(getDiagnosticText(Diagnostics.Version_0, version) + sys2.newLine);
@@ -135016,7 +135088,7 @@ function printAllHelp(sys2, compilerOptions, buildOptions, watchOptions) {
   output = [...output, ...generateSectionOptionsOutput(
     sys2,
     getDiagnosticText(Diagnostics.BUILD_OPTIONS),
-    buildOptions,
+    filter(buildOptions, (option) => option !== tscBuildOption),
     /*subCategory*/
     false,
     formatMessage(Diagnostics.Using_build_b_will_make_tsc_behave_more_like_a_build_orchestrator_than_a_compiler_This_is_used_to_trigger_building_composite_projects_which_you_can_learn_more_about_at_0, "https://aka.ms/tsc-composite-builds")
@@ -135030,7 +135102,7 @@ function printBuildHelp(sys2, buildOptions) {
   output = [...output, ...generateSectionOptionsOutput(
     sys2,
     getDiagnosticText(Diagnostics.BUILD_OPTIONS),
-    buildOptions,
+    filter(buildOptions, (option) => option !== tscBuildOption),
     /*subCategory*/
     false,
     formatMessage(Diagnostics.Using_build_b_will_make_tsc_behave_more_like_a_build_orchestrator_than_a_compiler_This_is_used_to_trigger_building_composite_projects_which_you_can_learn_more_about_at_0, "https://aka.ms/tsc-composite-builds")
@@ -135067,10 +135139,6 @@ function printHelp(sys2, commandLine) {
 }
 function executeCommandLineWorker(sys2, cb, commandLine) {
   let reportDiagnostic = createDiagnosticReporter(sys2);
-  if (commandLine.options.build) {
-    reportDiagnostic(createCompilerDiagnostic(Diagnostics.Option_build_must_be_the_first_command_line_argument));
-    return sys2.exit(1 /* DiagnosticsPresent_OutputsSkipped */);
-  }
   let configFileName;
   if (commandLine.options.locale) {
     validateLocaleAndSetLanguage(commandLine.options.locale, sys2, commandLine.errors);
@@ -135216,16 +135284,16 @@ function executeCommandLineWorker(sys2, cb, commandLine) {
     }
   }
 }
-function isBuild(commandLineArgs) {
+function isBuildCommand(commandLineArgs) {
   if (commandLineArgs.length > 0 && commandLineArgs[0].charCodeAt(0) === 45 /* minus */) {
     const firstOption = commandLineArgs[0].slice(commandLineArgs[0].charCodeAt(1) === 45 /* minus */ ? 2 : 1).toLowerCase();
-    return firstOption === "build" || firstOption === "b";
+    return firstOption === tscBuildOption.name || firstOption === tscBuildOption.shortName;
   }
   return false;
 }
 function executeCommandLine(system, cb, commandLineArgs) {
-  if (isBuild(commandLineArgs)) {
-    const { buildOptions, watchOptions, projects, errors } = parseBuildCommand(commandLineArgs.slice(1));
+  if (isBuildCommand(commandLineArgs)) {
+    const { buildOptions, watchOptions, projects, errors } = parseBuildCommand(commandLineArgs);
     if (buildOptions.generateCpuProfile && system.enableCPUProfiler) {
       system.enableCPUProfiler(buildOptions.generateCpuProfile, () => performBuild(
         system,
@@ -139062,28 +139130,33 @@ function tryAndIgnoreErrors(cb) {
 function tryIOAndConsumeErrors(host, toApply, ...args) {
   return tryAndIgnoreErrors(() => toApply && toApply.apply(host, args));
 }
-function findPackageJsons(startDirectory, host, stopDirectory) {
+function findPackageJsons(startDirectory, host) {
   const paths = [];
-  forEachAncestorDirectory(startDirectory, (ancestor) => {
-    if (ancestor === stopDirectory) {
-      return true;
-    }
-    const currentConfigPath = combinePaths(ancestor, "package.json");
-    if (tryFileExists(host, currentConfigPath)) {
-      paths.push(currentConfigPath);
+  forEachAncestorDirectoryStoppingAtGlobalCache(
+    host,
+    startDirectory,
+    (ancestor) => {
+      const currentConfigPath = combinePaths(ancestor, "package.json");
+      if (tryFileExists(host, currentConfigPath)) {
+        paths.push(currentConfigPath);
+      }
     }
-  });
+  );
   return paths;
 }
 function findPackageJson(directory, host) {
   let packageJson;
-  forEachAncestorDirectory(directory, (ancestor) => {
-    if (ancestor === "node_modules") return true;
-    packageJson = findConfigFile(ancestor, (f) => tryFileExists(host, f), "package.json");
-    if (packageJson) {
-      return true;
+  forEachAncestorDirectoryStoppingAtGlobalCache(
+    host,
+    directory,
+    (ancestor) => {
+      if (ancestor === "node_modules") return true;
+      packageJson = findConfigFile(ancestor, (f) => tryFileExists(host, f), "package.json");
+      if (packageJson) {
+        return true;
+      }
     }
-  });
+  );
   return packageJson;
 }
 function getPackageJsonsVisibleToFile(fileName, host) {
@@ -139091,15 +139164,19 @@ function getPackageJsonsVisibleToFile(fileName, host) {
     return [];
   }
   const packageJsons = [];
-  forEachAncestorDirectory(getDirectoryPath(fileName), (ancestor) => {
-    const packageJsonFileName = combinePaths(ancestor, "package.json");
-    if (host.fileExists(packageJsonFileName)) {
-      const info = createPackageJsonInfo(packageJsonFileName, host);
-      if (info) {
-        packageJsons.push(info);
+  forEachAncestorDirectoryStoppingAtGlobalCache(
+    host,
+    getDirectoryPath(fileName),
+    (ancestor) => {
+      const packageJsonFileName = combinePaths(ancestor, "package.json");
+      if (host.fileExists(packageJsonFileName)) {
+        const info = createPackageJsonInfo(packageJsonFileName, host);
+        if (info) {
+          packageJsons.push(info);
+        }
       }
     }
-  });
+  );
   return packageJsons;
 }
 function createPackageJsonInfo(fileName, host) {
@@ -139786,7 +139863,13 @@ function isImportable(program, fromFile, toFile, toModule, preferences, packageJ
     false,
     (toPath3) => {
       const file = program.getSourceFile(toPath3);
-      return (file === toFile || !file) && isImportablePath(fromFile.fileName, toPath3, getCanonicalFileName, globalTypingsCache);
+      return (file === toFile || !file) && isImportablePath(
+        fromFile.fileName,
+        toPath3,
+        getCanonicalFileName,
+        globalTypingsCache,
+        moduleSpecifierResolutionHost
+      );
     }
   );
   if (packageJsonFilter) {
@@ -139799,8 +139882,12 @@ function isImportable(program, fromFile, toFile, toModule, preferences, packageJ
 function fileContainsPackageImport(sourceFile, packageName) {
   return sourceFile.imports && sourceFile.imports.some((i) => i.text === packageName || i.text.startsWith(packageName + "/"));
 }
-function isImportablePath(fromPath, toPath3, getCanonicalFileName, globalCachePath) {
-  const toNodeModules = forEachAncestorDirectory(toPath3, (ancestor) => getBaseFileName(ancestor) === "node_modules" ? ancestor : void 0);
+function isImportablePath(fromPath, toPath3, getCanonicalFileName, globalCachePath, host) {
+  const toNodeModules = forEachAncestorDirectoryStoppingAtGlobalCache(
+    host,
+    toPath3,
+    (ancestor) => getBaseFileName(ancestor) === "node_modules" ? ancestor : void 0
+  );
   const toNodeModulesParent = toNodeModules && getDirectoryPath(getCanonicalFileName(toNodeModules));
   return toNodeModulesParent === void 0 || startsWith(getCanonicalFileName(fromPath), toNodeModulesParent) || !!globalCachePath && startsWith(getCanonicalFileName(globalCachePath), toNodeModulesParent);
 }
@@ -139871,13 +139958,17 @@ function getIsExcluded(excludePatterns, host) {
     if (excludePatterns.some((p) => p.test(fileName))) return true;
     if ((realpathsWithSymlinks == null ? void 0 : realpathsWithSymlinks.size) && pathContainsNodeModules(fileName)) {
       let dir = getDirectoryPath(fileName);
-      return forEachAncestorDirectory(getDirectoryPath(path), (dirPath) => {
-        const symlinks = realpathsWithSymlinks.get(ensureTrailingDirectorySeparator(dirPath));
-        if (symlinks) {
-          return symlinks.some((s) => excludePatterns.some((p) => p.test(fileName.replace(dir, s))));
+      return forEachAncestorDirectoryStoppingAtGlobalCache(
+        host,
+        getDirectoryPath(path),
+        (dirPath) => {
+          const symlinks = realpathsWithSymlinks.get(ensureTrailingDirectorySeparator(dirPath));
+          if (symlinks) {
+            return symlinks.some((s) => excludePatterns.some((p) => p.test(fileName.replace(dir, s))));
+          }
+          dir = getDirectoryPath(dir);
         }
-        dir = getDirectoryPath(dir);
-      }) ?? false;
+      ) ?? false;
     }
     return false;
   };
@@ -150252,7 +150343,8 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
       resolveLibrary: maybeBind(host, host.resolveLibrary),
       useSourceOfProjectReferenceRedirect: maybeBind(host, host.useSourceOfProjectReferenceRedirect),
       getParsedCommandLine,
-      jsDocParsingMode: host.jsDocParsingMode
+      jsDocParsingMode: host.jsDocParsingMode,
+      getGlobalTypingsCacheLocation: maybeBind(host, host.getGlobalTypingsCacheLocation)
     };
     const originalGetSourceFile = compilerHost.getSourceFile;
     const { getSourceFileWithCache } = changeCompilerHostLikeToUseCache(
@@ -155756,9 +155848,19 @@ function createImportAdderWorker(sourceFile, program, useAutoImportProvider, pre
     );
     if (fix) {
       const localName = ((_b = tryCast(referenceImport == null ? void 0 : referenceImport.name, isIdentifier)) == null ? void 0 : _b.text) ?? symbolName2;
+      let addAsTypeOnly;
+      let propertyName;
       if (referenceImport && isTypeOnlyImportDeclaration(referenceImport) && (fix.kind === 3 /* AddNew */ || fix.kind === 2 /* AddToExisting */) && fix.addAsTypeOnly === 1 /* Allowed */) {
-        fix = { ...fix, addAsTypeOnly: 2 /* Required */ };
+        addAsTypeOnly = 2 /* Required */;
       }
+      if (exportedSymbol.name !== localName) {
+        propertyName = exportedSymbol.name;
+      }
+      fix = {
+        ...fix,
+        ...addAsTypeOnly === void 0 ? {} : { addAsTypeOnly },
+        ...propertyName === void 0 ? {} : { propertyName }
+      };
       addImport({ fix, symbolName: localName ?? symbolName2, errorIdentifierText: void 0 });
     }
   }
@@ -155824,7 +155926,7 @@ function createImportAdderWorker(sourceFile, program, useAutoImportProvider, pre
     removeExisting.add(declaration);
   }
   function addImport(info) {
-    var _a, _b;
+    var _a, _b, _c;
     const { fix, symbolName: symbolName2 } = info;
     switch (fix.kind) {
       case 0 /* UseNamespace */:
@@ -155834,40 +155936,40 @@ function createImportAdderWorker(sourceFile, program, useAutoImportProvider, pre
         importType.push(fix);
         break;
       case 2 /* AddToExisting */: {
-        const { importClauseOrBindingPattern, importKind, addAsTypeOnly } = fix;
+        const { importClauseOrBindingPattern, importKind, addAsTypeOnly, propertyName } = fix;
         let entry = addToExisting.get(importClauseOrBindingPattern);
         if (!entry) {
           addToExisting.set(importClauseOrBindingPattern, entry = { importClauseOrBindingPattern, defaultImport: void 0, namedImports: /* @__PURE__ */ new Map() });
         }
         if (importKind === 0 /* Named */) {
-          const prevValue = entry == null ? void 0 : entry.namedImports.get(symbolName2);
-          entry.namedImports.set(symbolName2, reduceAddAsTypeOnlyValues(prevValue, addAsTypeOnly));
+          const prevTypeOnly = (_a = entry == null ? void 0 : entry.namedImports.get(symbolName2)) == null ? void 0 : _a.addAsTypeOnly;
+          entry.namedImports.set(symbolName2, { addAsTypeOnly: reduceAddAsTypeOnlyValues(prevTypeOnly, addAsTypeOnly), propertyName });
         } else {
           Debug.assert(entry.defaultImport === void 0 || entry.defaultImport.name === symbolName2, "(Add to Existing) Default import should be missing or match symbolName");
           entry.defaultImport = {
             name: symbolName2,
-            addAsTypeOnly: reduceAddAsTypeOnlyValues((_a = entry.defaultImport) == null ? void 0 : _a.addAsTypeOnly, addAsTypeOnly)
+            addAsTypeOnly: reduceAddAsTypeOnlyValues((_b = entry.defaultImport) == null ? void 0 : _b.addAsTypeOnly, addAsTypeOnly)
           };
         }
         break;
       }
       case 3 /* AddNew */: {
-        const { moduleSpecifier, importKind, useRequire, addAsTypeOnly } = fix;
+        const { moduleSpecifier, importKind, useRequire, addAsTypeOnly, propertyName } = fix;
         const entry = getNewImportEntry(moduleSpecifier, importKind, useRequire, addAsTypeOnly);
         Debug.assert(entry.useRequire === useRequire, "(Add new) Tried to add an `import` and a `require` for the same module");
         switch (importKind) {
           case 1 /* Default */:
             Debug.assert(entry.defaultImport === void 0 || entry.defaultImport.name === symbolName2, "(Add new) Default import should be missing or match symbolName");
-            entry.defaultImport = { name: symbolName2, addAsTypeOnly: reduceAddAsTypeOnlyValues((_b = entry.defaultImport) == null ? void 0 : _b.addAsTypeOnly, addAsTypeOnly) };
+            entry.defaultImport = { name: symbolName2, addAsTypeOnly: reduceAddAsTypeOnlyValues((_c = entry.defaultImport) == null ? void 0 : _c.addAsTypeOnly, addAsTypeOnly) };
             break;
           case 0 /* Named */:
             const prevValue = (entry.namedImports || (entry.namedImports = /* @__PURE__ */ new Map())).get(symbolName2);
-            entry.namedImports.set(symbolName2, reduceAddAsTypeOnlyValues(prevValue, addAsTypeOnly));
+            entry.namedImports.set(symbolName2, [reduceAddAsTypeOnlyValues(prevValue, addAsTypeOnly), propertyName]);
             break;
           case 3 /* CommonJS */:
             if (compilerOptions.verbatimModuleSyntax) {
               const prevValue2 = (entry.namedImports || (entry.namedImports = /* @__PURE__ */ new Map())).get(symbolName2);
-              entry.namedImports.set(symbolName2, reduceAddAsTypeOnlyValues(prevValue2, addAsTypeOnly));
+              entry.namedImports.set(symbolName2, [reduceAddAsTypeOnlyValues(prevValue2, addAsTypeOnly), propertyName]);
             } else {
               Debug.assert(entry.namespaceLikeImport === void 0 || entry.namespaceLikeImport.name === symbolName2, "Namespacelike import shoudl be missing or match symbolName");
               entry.namespaceLikeImport = { importKind, name: symbolName2, addAsTypeOnly };
@@ -156021,7 +156123,7 @@ function createImportAdderWorker(sourceFile, program, useAutoImportProvider, pre
         sourceFile,
         importClauseOrBindingPattern,
         defaultImport,
-        arrayFrom(namedImports.entries(), ([name, addAsTypeOnly]) => ({ addAsTypeOnly, name })),
+        arrayFrom(namedImports.entries(), ([name, { addAsTypeOnly, propertyName }]) => ({ addAsTypeOnly, propertyName, name })),
         importSpecifiersToRemoveWhileAdding,
         preferences
       );
@@ -156034,7 +156136,7 @@ function createImportAdderWorker(sourceFile, program, useAutoImportProvider, pre
         moduleSpecifier,
         quotePreference,
         defaultImport,
-        namedImports && arrayFrom(namedImports.entries(), ([name, addAsTypeOnly]) => ({ addAsTypeOnly, name })),
+        namedImports && arrayFrom(namedImports.entries(), ([name, [addAsTypeOnly, propertyName]]) => ({ addAsTypeOnly, propertyName, name })),
         namespaceLikeImport,
         compilerOptions,
         preferences
@@ -156934,8 +157036,7 @@ function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImpor
           ...namedImports.map((i) => factory.createBindingElement(
             /*dotDotDotToken*/
             void 0,
-            /*propertyName*/
-            void 0,
+            i.propertyName,
             i.name
           ))
         ])
@@ -156946,12 +157047,7 @@ function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImpor
       addElementToBindingPattern(clause, defaultImport.name, "default");
     }
     for (const specifier of namedImports) {
-      addElementToBindingPattern(
-        clause,
-        specifier.name,
-        /*propertyName*/
-        void 0
-      );
+      addElementToBindingPattern(clause, specifier.name, specifier.propertyName);
     }
     return;
   }
@@ -156967,8 +157063,7 @@ function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImpor
       namedImports.map(
         (namedImport) => factory.createImportSpecifier(
           (!clause.isTypeOnly || promoteFromTypeOnly2) && shouldUseTypeOnly(namedImport, preferences),
-          /*propertyName*/
-          void 0,
+          namedImport.propertyName === void 0 ? void 0 : factory.createIdentifier(namedImport.propertyName),
           factory.createIdentifier(namedImport.name)
         )
       ),
@@ -157063,8 +157158,7 @@ function getNewImports(moduleSpecifier, quotePreference, defaultImport, namedImp
         namedImports == null ? void 0 : namedImports.map(
           (namedImport) => factory.createImportSpecifier(
             !topLevelTypeOnly && shouldUseTypeOnly(namedImport, preferences),
-            /*propertyName*/
-            void 0,
+            namedImport.propertyName === void 0 ? void 0 : factory.createIdentifier(namedImport.propertyName),
             factory.createIdentifier(namedImport.name)
           )
         ),
@@ -157102,11 +157196,10 @@ function getNewRequires(moduleSpecifier, quotePreference, defaultImport, namedIm
   const quotedModuleSpecifier = makeStringLiteral(moduleSpecifier, quotePreference);
   let statements;
   if (defaultImport || (namedImports == null ? void 0 : namedImports.length)) {
-    const bindingElements = (namedImports == null ? void 0 : namedImports.map(({ name }) => factory.createBindingElement(
+    const bindingElements = (namedImports == null ? void 0 : namedImports.map(({ name, propertyName }) => factory.createBindingElement(
       /*dotDotDotToken*/
       void 0,
-      /*propertyName*/
-      void 0,
+      propertyName,
       name
     ))) || [];
     if (defaultImport) {
@@ -165650,7 +165743,7 @@ function getSourceFromOrigin(origin) {
 }
 function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, contextToken, location, position, sourceFile, host, program, target, log, kind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, importStatementCompletion, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap, isJsxIdentifierExpected, isRightOfOpenTag, includeSymbol = false) {
   const start = timestamp();
-  const variableOrParameterDeclaration = getVariableOrParameterDeclaration(contextToken, location);
+  const closestSymbolDeclaration = getClosestSymbolDeclaration(contextToken, location);
   const useSemicolons = probablyUsesSemicolons(sourceFile);
   const typeChecker = program.getTypeChecker();
   const uniques = /* @__PURE__ */ new Map();
@@ -165720,15 +165813,26 @@ function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, con
       if (isExportAssignment(location.parent)) {
         return true;
       }
-      if (tryCast(variableOrParameterDeclaration, isVariableDeclaration) && symbol.valueDeclaration === variableOrParameterDeclaration) {
+      if (tryCast(closestSymbolDeclaration, isVariableDeclaration) && symbol.valueDeclaration === closestSymbolDeclaration) {
         return false;
       }
       const symbolDeclaration = symbol.valueDeclaration ?? ((_a = symbol.declarations) == null ? void 0 : _a[0]);
-      if (variableOrParameterDeclaration && symbolDeclaration && (isTypeParameterDeclaration(variableOrParameterDeclaration) && isTypeParameterDeclaration(symbolDeclaration) || isParameter(variableOrParameterDeclaration) && isParameter(symbolDeclaration))) {
-        const symbolDeclarationPos = symbolDeclaration.pos;
-        const parameters = isParameter(variableOrParameterDeclaration) ? variableOrParameterDeclaration.parent.parameters : isInferTypeNode(variableOrParameterDeclaration.parent) ? void 0 : variableOrParameterDeclaration.parent.typeParameters;
-        if (symbolDeclarationPos >= variableOrParameterDeclaration.pos && parameters && symbolDeclarationPos < parameters.end) {
-          return false;
+      if (closestSymbolDeclaration && symbolDeclaration) {
+        if (isParameter(closestSymbolDeclaration) && isParameter(symbolDeclaration)) {
+          const parameters = closestSymbolDeclaration.parent.parameters;
+          if (symbolDeclaration.pos >= closestSymbolDeclaration.pos && symbolDeclaration.pos < parameters.end) {
+            return false;
+          }
+        } else if (isTypeParameterDeclaration(closestSymbolDeclaration) && isTypeParameterDeclaration(symbolDeclaration)) {
+          if (closestSymbolDeclaration === symbolDeclaration && (contextToken == null ? void 0 : contextToken.kind) === 96 /* ExtendsKeyword */) {
+            return false;
+          }
+          if (isInTypeParameterDefault(contextToken) && !isInferTypeNode(closestSymbolDeclaration.parent)) {
+            const typeParameters = closestSymbolDeclaration.parent.typeParameters;
+            if (typeParameters && symbolDeclaration.pos >= closestSymbolDeclaration.pos && symbolDeclaration.pos < typeParameters.end) {
+              return false;
+            }
+          }
         }
       }
       const symbolOrigin = skipAlias(symbol, typeChecker);
@@ -168011,11 +168115,28 @@ function isModuleSpecifierMissingOrEmpty(specifier) {
   if (nodeIsMissing(specifier)) return true;
   return !((_a = tryCast(isExternalModuleReference(specifier) ? specifier.expression : specifier, isStringLiteralLike)) == null ? void 0 : _a.text);
 }
-function getVariableOrParameterDeclaration(contextToken, location) {
+function getClosestSymbolDeclaration(contextToken, location) {
   if (!contextToken) return;
-  const possiblyParameterDeclaration = findAncestor(contextToken, (node) => isFunctionBlock(node) || isArrowFunctionBody(node) || isBindingPattern(node) ? "quit" : (isParameter(node) || isTypeParameterDeclaration(node)) && !isIndexSignatureDeclaration(node.parent));
-  const possiblyVariableDeclaration = findAncestor(location, (node) => isFunctionBlock(node) || isArrowFunctionBody(node) || isBindingPattern(node) ? "quit" : isVariableDeclaration(node));
-  return possiblyParameterDeclaration || possiblyVariableDeclaration;
+  let closestDeclaration = findAncestor(contextToken, (node) => isFunctionBlock(node) || isArrowFunctionBody(node) || isBindingPattern(node) ? "quit" : (isParameter(node) || isTypeParameterDeclaration(node)) && !isIndexSignatureDeclaration(node.parent));
+  if (!closestDeclaration) {
+    closestDeclaration = findAncestor(location, (node) => isFunctionBlock(node) || isArrowFunctionBody(node) || isBindingPattern(node) ? "quit" : isVariableDeclaration(node));
+  }
+  return closestDeclaration;
+}
+function isInTypeParameterDefault(contextToken) {
+  if (!contextToken) {
+    return false;
+  }
+  let node = contextToken;
+  let parent2 = contextToken.parent;
+  while (parent2) {
+    if (isTypeParameterDeclaration(parent2)) {
+      return parent2.default === node || node.kind === 64 /* EqualsToken */;
+    }
+    node = parent2;
+    parent2 = parent2.parent;
+  }
+  return false;
 }
 function isArrowFunctionBody(node) {
   return node.parent && isArrowFunction(node.parent) && (node.parent.body === node || // const a = () => /**/;
@@ -168781,7 +168902,7 @@ function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, mode, p
           return nodeModulesDirectoryLookup(ancestor);
         };
       }
-      forEachAncestorDirectory(scriptPath, ancestorLookup);
+      forEachAncestorDirectoryStoppingAtGlobalCache(host, scriptPath, ancestorLookup);
     }
   }
   return arrayFrom(result.values());
@@ -180399,6 +180520,7 @@ __export(ts_exports2, {
   canWatchAffectingLocation: () => canWatchAffectingLocation,
   canWatchAtTypes: () => canWatchAtTypes,
   canWatchDirectoryOrFile: () => canWatchDirectoryOrFile,
+  canWatchDirectoryOrFilePath: () => canWatchDirectoryOrFilePath,
   cartesianProduct: () => cartesianProduct,
   cast: () => cast,
   chainBundle: () => chainBundle,
@@ -180731,6 +180853,7 @@ __export(ts_exports2, {
   forEach: () => forEach,
   forEachAncestor: () => forEachAncestor,
   forEachAncestorDirectory: () => forEachAncestorDirectory,
+  forEachAncestorDirectoryStoppingAtGlobalCache: () => forEachAncestorDirectoryStoppingAtGlobalCache,
   forEachChild: () => forEachChild,
   forEachChildRecursively: () => forEachChildRecursively,
   forEachEmittedFile: () => forEachEmittedFile,
@@ -181344,7 +181467,7 @@ __export(ts_exports2, {
   isBooleanLiteral: () => isBooleanLiteral,
   isBreakOrContinueStatement: () => isBreakOrContinueStatement,
   isBreakStatement: () => isBreakStatement,
-  isBuild: () => isBuild,
+  isBuildCommand: () => isBuildCommand,
   isBuildInfoFile: () => isBuildInfoFile,
   isBuilderProgram: () => isBuilderProgram,
   isBundle: () => isBundle,
@@ -182259,6 +182382,7 @@ __export(ts_exports2, {
   tagNamesAreEquivalent: () => tagNamesAreEquivalent,
   takeWhile: () => takeWhile,
   targetOptionDeclaration: () => targetOptionDeclaration,
+  targetToLibMap: () => targetToLibMap,
   testFormatSettings: () => testFormatSettings,
   textChangeRangeIsUnchanged: () => textChangeRangeIsUnchanged,
   textChangeRangeNewSpan: () => textChangeRangeNewSpan,
@@ -182352,6 +182476,7 @@ __export(ts_exports2, {
   tryRemoveExtension: () => tryRemoveExtension,
   tryRemovePrefix: () => tryRemovePrefix,
   tryRemoveSuffix: () => tryRemoveSuffix,
+  tscBuildOption: () => tscBuildOption,
   typeAcquisitionDeclarations: () => typeAcquisitionDeclarations,
   typeAliasNamePart: () => typeAliasNamePart,
   typeDirectiveIsEqualTo: () => typeDirectiveIsEqualTo,
@@ -182577,6 +182702,7 @@ __export(ts_server_exports3, {
   formatDiagnosticToProtocol: () => formatDiagnosticToProtocol,
   formatMessage: () => formatMessage2,
   getBaseConfigFileName: () => getBaseConfigFileName,
+  getDetailWatchInfo: () => getDetailWatchInfo,
   getLocationInNewDocument: () => getLocationInNewDocument,
   hasArgument: () => hasArgument,
   hasNoTypeScriptSource: () => hasNoTypeScriptSource,
@@ -183995,10 +184121,9 @@ function unresolvedImportsChanged(imports1, imports2) {
 }
 var Project2 = class _Project {
   /** @internal */
-  constructor(projectName, projectKind, projectService, documentRegistry, hasExplicitListOfFiles, lastFileExceededProgramSize, compilerOptions, compileOnSaveEnabled, watchOptions, directoryStructureHost, currentDirectory) {
+  constructor(projectName, projectKind, projectService, hasExplicitListOfFiles, lastFileExceededProgramSize, compilerOptions, compileOnSaveEnabled, watchOptions, directoryStructureHost, currentDirectory) {
     this.projectKind = projectKind;
     this.projectService = projectService;
-    this.documentRegistry = documentRegistry;
     this.compilerOptions = compilerOptions;
     this.compileOnSaveEnabled = compileOnSaveEnabled;
     this.watchOptions = watchOptions;
@@ -184045,6 +184170,7 @@ var Project2 = class _Project {
     this.globalCacheResolutionModuleName = ts_JsTyping_exports.nonRelativeModuleNameForTypingCache;
     /** @internal */
     this.updateFromProjectInProgress = false;
+    projectService.logger.info(`Creating ${ProjectKind[projectKind]}Project: ${projectName}, currentDirectory: ${currentDirectory}`);
     this.projectName = projectName;
     this.directoryStructureHost = directoryStructureHost;
     this.currentDirectory = this.projectService.getNormalizedAbsolutePath(currentDirectory);
@@ -184090,7 +184216,11 @@ var Project2 = class _Project {
       /*logChangesWhenResolvingModule*/
       true
     );
-    this.languageService = createLanguageService(this, this.documentRegistry, this.projectService.serverMode);
+    this.languageService = createLanguageService(
+      this,
+      this.projectService.documentRegistry,
+      this.projectService.serverMode
+    );
     if (lastFileExceededProgramSize) {
       this.disableLanguageService(lastFileExceededProgramSize);
     }
@@ -184164,7 +184294,7 @@ var Project2 = class _Project {
   }
   /** @internal */
   getGlobalTypingsCacheLocation() {
-    return this.getGlobalCache();
+    return this.getTypeAcquisition().enable ? this.projectService.typingsInstaller.globalTypingsCacheLocation : void 0;
   }
   /** @internal */
   getSymlinkCache() {
@@ -184379,10 +184509,6 @@ var Project2 = class _Project {
     this.projectService.delayUpdateProjectGraphAndEnsureProjectStructureForOpenFiles(this);
   }
   /** @internal */
-  getGlobalCache() {
-    return this.getTypeAcquisition().enable ? this.projectService.typingsInstaller.globalTypingsCacheLocation : void 0;
-  }
-  /** @internal */
   fileIsOpen(filePath) {
     return this.projectService.openFiles.has(filePath);
   }
@@ -184912,14 +185038,15 @@ var Project2 = class _Project {
       const canonicalPath = this.toPath(path);
       toRemove.delete(canonicalPath);
       if (!this.typingWatchers.has(canonicalPath)) {
+        const watchType = typingsWatcherType === "FileWatcher" /* FileWatcher */ ? WatchType.TypingInstallerLocationFile : WatchType.TypingInstallerLocationDirectory;
         this.typingWatchers.set(
           canonicalPath,
-          typingsWatcherType === "FileWatcher" /* FileWatcher */ ? this.projectService.watchFactory.watchFile(
+          canWatchDirectoryOrFilePath(canonicalPath) ? typingsWatcherType === "FileWatcher" /* FileWatcher */ ? this.projectService.watchFactory.watchFile(
             path,
             () => !this.typingWatchers.isInvoked ? this.onTypingInstallerWatchInvoke() : this.writeLog(`TypingWatchers already invoked`),
             2e3 /* High */,
             this.projectService.getWatchOptions(this),
-            WatchType.TypingInstallerLocationFile,
+            watchType,
             this
           ) : this.projectService.watchFactory.watchDirectory(
             path,
@@ -184931,9 +185058,9 @@ var Project2 = class _Project {
             },
             1 /* Recursive */,
             this.projectService.getWatchOptions(this),
-            WatchType.TypingInstallerLocationDirectory,
+            watchType,
             this
-          )
+          ) : (this.writeLog(`Skipping watcher creation at ${path}:: ${getDetailWatchInfo(watchType, this)}`), noopFileWatcher)
         );
       }
     };
@@ -184969,7 +185096,7 @@ var Project2 = class _Project {
   }
   removeExistingTypings(include) {
     if (!include.length) return include;
-    const existing = getAutomaticTypeDirectiveNames(this.getCompilerOptions(), this.directoryStructureHost);
+    const existing = getAutomaticTypeDirectiveNames(this.getCompilerOptions(), this);
     return filter(include, (i) => !existing.includes(i));
   }
   updateGraphWorker() {
@@ -185475,7 +185602,7 @@ var Project2 = class _Project {
   }
   /** @internal */
   getNearestAncestorDirectoryWithPackageJson(fileName) {
-    return this.projectService.getNearestAncestorDirectoryWithPackageJson(fileName);
+    return this.projectService.getNearestAncestorDirectoryWithPackageJson(fileName, this);
   }
   /** @internal */
   getPackageJsonsForAutoImport(rootDir) {
@@ -185546,7 +185673,11 @@ var Project2 = class _Project {
     if (dependencySelection) {
       (_a = tracing) == null ? void 0 : _a.push(tracing.Phase.Session, "getPackageJsonAutoImportProvider");
       const start = timestamp();
-      this.autoImportProviderHost = AutoImportProviderProject.create(dependencySelection, this, this.getHostForAutoImportProvider(), this.documentRegistry) ?? false;
+      this.autoImportProviderHost = AutoImportProviderProject.create(
+        dependencySelection,
+        this,
+        this.getHostForAutoImportProvider()
+      ) ?? false;
       if (this.autoImportProviderHost) {
         updateProjectIfDirty(this.autoImportProviderHost);
         this.sendPerformanceEvent("CreatePackageJsonAutoImportProvider", timestamp() - start);
@@ -185573,11 +185704,12 @@ var Project2 = class _Project {
   /** @internal */
   getNoDtsResolutionProject(rootFile) {
     Debug.assert(this.projectService.serverMode === 0 /* Semantic */);
-    if (!this.noDtsResolutionProject) {
-      this.noDtsResolutionProject = new AuxiliaryProject(this.projectService, this.documentRegistry, this.getCompilerOptionsForNoDtsResolutionProject(), this.currentDirectory);
-    }
+    this.noDtsResolutionProject ?? (this.noDtsResolutionProject = new AuxiliaryProject(this));
     if (this.noDtsResolutionProject.rootFile !== rootFile) {
-      this.projectService.setFileNamesOfAutpImportProviderOrAuxillaryProject(this.noDtsResolutionProject, [rootFile]);
+      this.projectService.setFileNamesOfAutoImportProviderOrAuxillaryProject(
+        this.noDtsResolutionProject,
+        [rootFile]
+      );
       this.noDtsResolutionProject.rootFile = rootFile;
     }
     return this.noDtsResolutionProject;
@@ -185596,6 +185728,7 @@ var Project2 = class _Project {
       (_d = this.getScriptInfo(rootFile)) == null ? void 0 : _d.editContent(0, updatedText.length, originalText);
     }
   }
+  /** @internal */
   getCompilerOptionsForNoDtsResolutionProject() {
     return {
       ...this.getCompilerOptions(),
@@ -185638,15 +185771,13 @@ function extractUnresolvedImportsFromSourceFile(program, file, ambientModules, c
 }
 var InferredProject2 = class extends Project2 {
   /** @internal */
-  constructor(projectService, documentRegistry, compilerOptions, watchOptions, projectRootPath, currentDirectory, typeAcquisition) {
+  constructor(projectService, compilerOptions, watchOptions, projectRootPath, currentDirectory, typeAcquisition) {
     super(
       projectService.newInferredProjectName(),
       0 /* Inferred */,
       projectService,
-      documentRegistry,
-      // TODO: GH#18217
-      /*files*/
-      void 0,
+      /*hasExplicitListOfFiles*/
+      false,
       /*lastFileExceededProgramSize*/
       void 0,
       compilerOptions,
@@ -185731,23 +185862,22 @@ var InferredProject2 = class extends Project2 {
   }
 };
 var AuxiliaryProject = class extends Project2 {
-  constructor(projectService, documentRegistry, compilerOptions, currentDirectory) {
+  constructor(hostProject) {
     super(
-      projectService.newAuxiliaryProjectName(),
+      hostProject.projectService.newAuxiliaryProjectName(),
       4 /* Auxiliary */,
-      projectService,
-      documentRegistry,
+      hostProject.projectService,
       /*hasExplicitListOfFiles*/
       false,
       /*lastFileExceededProgramSize*/
       void 0,
-      compilerOptions,
+      hostProject.getCompilerOptionsForNoDtsResolutionProject(),
       /*compileOnSaveEnabled*/
       false,
       /*watchOptions*/
       void 0,
-      projectService.host,
-      currentDirectory
+      hostProject.projectService.host,
+      hostProject.currentDirectory
     );
   }
   isOrphan() {
@@ -185759,12 +185889,11 @@ var AuxiliaryProject = class extends Project2 {
 };
 var _AutoImportProviderProject = class _AutoImportProviderProject extends Project2 {
   /** @internal */
-  constructor(hostProject, initialRootNames, documentRegistry, compilerOptions) {
+  constructor(hostProject, initialRootNames, compilerOptions) {
     super(
       hostProject.projectService.newAutoImportProviderProjectName(),
       3 /* AutoImportProvider */,
       hostProject.projectService,
-      documentRegistry,
       /*hasExplicitListOfFiles*/
       false,
       /*lastFileExceededProgramSize*/
@@ -185925,7 +186054,7 @@ var _AutoImportProviderProject = class _AutoImportProviderProject extends Projec
     }
   }
   /** @internal */
-  static create(dependencySelection, hostProject, host, documentRegistry) {
+  static create(dependencySelection, hostProject, host) {
     if (dependencySelection === 0 /* Off */) {
       return void 0;
     }
@@ -185937,7 +186066,7 @@ var _AutoImportProviderProject = class _AutoImportProviderProject extends Projec
     if (!rootNames.length) {
       return void 0;
     }
-    return new _AutoImportProviderProject(hostProject, rootNames, documentRegistry, compilerOptions);
+    return new _AutoImportProviderProject(hostProject, rootNames, compilerOptions);
   }
   /** @internal */
   isEmpty() {
@@ -185957,7 +186086,7 @@ var _AutoImportProviderProject = class _AutoImportProviderProject extends Projec
         this.getCompilationSettings()
       );
     }
-    this.projectService.setFileNamesOfAutpImportProviderOrAuxillaryProject(this, rootFileNames);
+    this.projectService.setFileNamesOfAutoImportProviderOrAuxillaryProject(this, rootFileNames);
     this.rootFileNames = rootFileNames;
     const oldProgram = this.getCurrentProgram();
     const hasSameSetOfFiles = super.updateGraph();
@@ -186026,12 +186155,11 @@ _AutoImportProviderProject.compilerOptionsOverrides = {
 var AutoImportProviderProject = _AutoImportProviderProject;
 var ConfiguredProject2 = class extends Project2 {
   /** @internal */
-  constructor(configFileName, canonicalConfigFilePath, projectService, documentRegistry, cachedDirectoryStructureHost, pendingUpdateReason) {
+  constructor(configFileName, canonicalConfigFilePath, projectService, cachedDirectoryStructureHost, pendingUpdateReason) {
     super(
       configFileName,
       1 /* Configured */,
       projectService,
-      documentRegistry,
       /*hasExplicitListOfFiles*/
       false,
       /*lastFileExceededProgramSize*/
@@ -186231,12 +186359,11 @@ var ConfiguredProject2 = class extends Project2 {
 };
 var ExternalProject = class extends Project2 {
   /** @internal */
-  constructor(externalProjectName, projectService, documentRegistry, compilerOptions, lastFileExceededProgramSize, compileOnSaveEnabled, projectFilePath, watchOptions) {
+  constructor(externalProjectName, projectService, compilerOptions, lastFileExceededProgramSize, compileOnSaveEnabled, projectFilePath, watchOptions) {
     super(
       externalProjectName,
       2 /* External */,
       projectService,
-      documentRegistry,
       /*hasExplicitListOfFiles*/
       true,
       lastFileExceededProgramSize,
@@ -186844,6 +186971,9 @@ var _ProjectService = class _ProjectService {
     this.toCanonicalFileName = createGetCanonicalFileName(this.host.useCaseSensitiveFileNames);
     this.globalCacheLocationDirectoryPath = this.typingsInstaller.globalTypingsCacheLocation ? ensureTrailingDirectorySeparator(this.toPath(this.typingsInstaller.globalTypingsCacheLocation)) : void 0;
     this.throttledOperations = new ThrottledOperations(this.host, this.logger);
+    this.logger.info(`currentDirectory:: ${this.host.getCurrentDirectory()} useCaseSensitiveFileNames:: ${this.host.useCaseSensitiveFileNames}`);
+    this.logger.info(`libs Location:: ${getDirectoryPath(this.host.getExecutingFilePath())}`);
+    this.logger.info(`globalTypingsCacheLocation:: ${this.typingsInstaller.globalTypingsCacheLocation}`);
     if (this.typesMapLocation) {
       this.loadTypesMap();
     } else {
@@ -186856,7 +186986,12 @@ var _ProjectService = class _ProjectService {
       hostInfo: "Unknown host",
       extraFileExtensions: []
     };
-    this.documentRegistry = createDocumentRegistryInternal(this.host.useCaseSensitiveFileNames, this.currentDirectory, this.jsDocParsingMode, this);
+    this.documentRegistry = createDocumentRegistryInternal(
+      this.host.useCaseSensitiveFileNames,
+      this.currentDirectory,
+      this.jsDocParsingMode,
+      this
+    );
     const watchLogLevel = this.logger.hasLevel(3 /* verbose */) ? 2 /* Verbose */ : this.logger.loggingEnabled() ? 1 /* TriggerOnly */ : 0 /* None */;
     const log = watchLogLevel !== 0 /* None */ ? (s) => this.logger.info(s) : noop;
     this.packageJsonCache = createPackageJsonCache(this);
@@ -187628,7 +187763,7 @@ var _ProjectService = class _ProjectService {
     Debug.checkDefined(configFileExistenceInfo.watcher);
     if ((_c = configFileExistenceInfo.openFilesImpactedByConfigFile) == null ? void 0 : _c.size) {
       if (configFileExistenceInfo.inferredProjectRoots) {
-        if (!canWatchDirectoryOrFile(getPathComponents(getDirectoryPath(canonicalConfigFilePath)))) {
+        if (!canWatchDirectoryOrFilePath(getDirectoryPath(canonicalConfigFilePath))) {
           configFileExistenceInfo.watcher.close();
           configFileExistenceInfo.watcher = noopConfigFileWatcher;
         }
@@ -187691,7 +187826,7 @@ var _ProjectService = class _ProjectService {
         configFileExistenceInfo.inferredProjectRoots = (configFileExistenceInfo.inferredProjectRoots ?? 0) + 1;
       }
       (configFileExistenceInfo.openFilesImpactedByConfigFile ?? (configFileExistenceInfo.openFilesImpactedByConfigFile = /* @__PURE__ */ new Set())).add(info.path);
-      configFileExistenceInfo.watcher || (configFileExistenceInfo.watcher = canWatchDirectoryOrFile(getPathComponents(getDirectoryPath(canonicalConfigFilePath))) ? this.watchFactory.watchFile(
+      configFileExistenceInfo.watcher || (configFileExistenceInfo.watcher = canWatchDirectoryOrFilePath(getDirectoryPath(canonicalConfigFilePath)) ? this.watchFactory.watchFile(
         configFileName,
         (_filename, eventKind) => this.onConfigFileChanged(configFileName, canonicalConfigFilePath, eventKind),
         2e3 /* High */,
@@ -187840,7 +187975,6 @@ var _ProjectService = class _ProjectService {
     const project = new ExternalProject(
       projectFileName,
       this,
-      this.documentRegistry,
       compilerOptions,
       /*lastFileExceededProgramSize*/
       this.getFilenameForExceededTotalSizeLimitForNonTsFiles(projectFileName, compilerOptions, files, externalFilePropertyReader),
@@ -187911,7 +188045,6 @@ var _ProjectService = class _ProjectService {
   createConfiguredProject(configFileName, reason) {
     var _a;
     (_a = tracing) == null ? void 0 : _a.instant(tracing.Phase.Session, "createConfiguredProject", { configFilePath: configFileName });
-    this.logger.info(`Creating configuration project ${configFileName}`);
     const canonicalConfigFilePath = asNormalizedPath(this.toCanonicalFileName(configFileName));
     let configFileExistenceInfo = this.configFileExistenceInfoCache.get(canonicalConfigFilePath);
     if (!configFileExistenceInfo) {
@@ -187930,7 +188063,6 @@ var _ProjectService = class _ProjectService {
       configFileName,
       canonicalConfigFilePath,
       this,
-      this.documentRegistry,
       configFileExistenceInfo.config.cachedDirectoryStructureHost,
       reason
     );
@@ -188207,7 +188339,7 @@ var _ProjectService = class _ProjectService {
     return fileNames;
   }
   /** @internal */
-  setFileNamesOfAutpImportProviderOrAuxillaryProject(project, fileNames) {
+  setFileNamesOfAutoImportProviderOrAuxillaryProject(project, fileNames) {
     this.updateNonInferredProjectFiles(project, fileNames, fileNamePropertyReader);
   }
   /** @internal */
@@ -188297,9 +188429,11 @@ var _ProjectService = class _ProjectService {
       return this.inferredProjects[0];
     }
     return this.createInferredProject(
-      "",
+      this.currentDirectory,
       /*isSingleInferredProject*/
-      true
+      true,
+      /*projectRootPath*/
+      void 0
     );
   }
   getOrCreateSingleInferredWithoutProjectRoot(currentDirectory) {
@@ -188310,7 +188444,13 @@ var _ProjectService = class _ProjectService {
         return inferredProject;
       }
     }
-    return this.createInferredProject(currentDirectory);
+    return this.createInferredProject(
+      currentDirectory,
+      /*isSingleInferredProject*/
+      false,
+      /*projectRootPath*/
+      void 0
+    );
   }
   createInferredProject(currentDirectory, isSingleInferredProject, projectRootPath) {
     const compilerOptions = projectRootPath && this.compilerOptionsForInferredProjectsPerProjectRoot.get(projectRootPath) || this.compilerOptionsForInferredProjects;
@@ -188327,7 +188467,14 @@ var _ProjectService = class _ProjectService {
       typeAcquisition = this.typeAcquisitionForInferredProjects;
     }
     watchOptionsAndErrors = watchOptionsAndErrors || void 0;
-    const project = new InferredProject2(this, this.documentRegistry, compilerOptions, watchOptionsAndErrors == null ? void 0 : watchOptionsAndErrors.watchOptions, projectRootPath, currentDirectory, typeAcquisition);
+    const project = new InferredProject2(
+      this,
+      compilerOptions,
+      watchOptionsAndErrors == null ? void 0 : watchOptionsAndErrors.watchOptions,
+      projectRootPath,
+      currentDirectory,
+      typeAcquisition
+    );
     project.setProjectErrors(watchOptionsAndErrors == null ? void 0 : watchOptionsAndErrors.errors);
     if (isSingleInferredProject) {
       this.inferredProjects.unshift(project);
@@ -189832,7 +189979,7 @@ Dynamic files must always be opened with service's current directory or service
       switch (packageJsonCache.directoryHasPackageJson(directory)) {
         // Sync and check same directory again
         case 3 /* Maybe */:
-          packageJsonCache.searchDirectoryAndAncestors(directory);
+          packageJsonCache.searchDirectoryAndAncestors(directory, project);
           return processDirectory(directory);
         // Check package.json
         case -1 /* True */:
@@ -189845,21 +189992,29 @@ Dynamic files must always be opened with service's current directory or service
         return true;
       }
     };
-    forEachAncestorDirectory(getDirectoryPath(fileName), processDirectory);
+    forEachAncestorDirectoryStoppingAtGlobalCache(
+      project,
+      getDirectoryPath(fileName),
+      processDirectory
+    );
     return result;
   }
   /** @internal */
-  getNearestAncestorDirectoryWithPackageJson(fileName) {
-    return forEachAncestorDirectory(fileName, (directory) => {
-      switch (this.packageJsonCache.directoryHasPackageJson(directory)) {
-        case -1 /* True */:
-          return directory;
-        case 0 /* False */:
-          return void 0;
-        case 3 /* Maybe */:
-          return this.host.fileExists(combinePaths(directory, "package.json")) ? directory : void 0;
+  getNearestAncestorDirectoryWithPackageJson(fileName, project) {
+    return forEachAncestorDirectoryStoppingAtGlobalCache(
+      project,
+      fileName,
+      (directory) => {
+        switch (this.packageJsonCache.directoryHasPackageJson(directory)) {
+          case -1 /* True */:
+            return directory;
+          case 0 /* False */:
+            return void 0;
+          case 3 /* Maybe */:
+            return this.host.fileExists(combinePaths(directory, "package.json")) ? directory : void 0;
+        }
       }
-    });
+    );
   }
   watchPackageJsonFile(file, path, project) {
     Debug.assert(project !== void 0);
@@ -190072,19 +190227,23 @@ function createPackageJsonCache(host) {
       return packageJsons.get(host.toPath(combinePaths(directory, "package.json"))) || void 0;
     },
     directoryHasPackageJson: (directory) => directoryHasPackageJson(host.toPath(directory)),
-    searchDirectoryAndAncestors: (directory) => {
-      forEachAncestorDirectory(directory, (ancestor) => {
-        const ancestorPath = host.toPath(ancestor);
-        if (directoryHasPackageJson(ancestorPath) !== 3 /* Maybe */) {
-          return true;
-        }
-        const packageJsonFileName = combinePaths(ancestor, "package.json");
-        if (tryFileExists(host, packageJsonFileName)) {
-          addOrUpdate(packageJsonFileName, combinePaths(ancestorPath, "package.json"));
-        } else {
-          directoriesWithoutPackageJson.set(ancestorPath, true);
+    searchDirectoryAndAncestors: (directory, project) => {
+      forEachAncestorDirectoryStoppingAtGlobalCache(
+        project,
+        directory,
+        (ancestor) => {
+          const ancestorPath = host.toPath(ancestor);
+          if (directoryHasPackageJson(ancestorPath) !== 3 /* Maybe */) {
+            return true;
+          }
+          const packageJsonFileName = combinePaths(ancestor, "package.json");
+          if (tryFileExists(host, packageJsonFileName)) {
+            addOrUpdate(packageJsonFileName, combinePaths(ancestorPath, "package.json"));
+          } else {
+            directoriesWithoutPackageJson.set(ancestorPath, true);
+          }
         }
-      });
+      );
     }
   };
   function addOrUpdate(fileName, path) {
@@ -194487,6 +194646,7 @@ __export(ts_server_exports4, {
   formatDiagnosticToProtocol: () => formatDiagnosticToProtocol,
   formatMessage: () => formatMessage2,
   getBaseConfigFileName: () => getBaseConfigFileName,
+  getDetailWatchInfo: () => getDetailWatchInfo,
   getLocationInNewDocument: () => getLocationInNewDocument,
   hasArgument: () => hasArgument,
   hasNoTypeScriptSource: () => hasNoTypeScriptSource,
@@ -194759,6 +194919,7 @@ if (typeof console !== "undefined") {
   canWatchAffectingLocation,
   canWatchAtTypes,
   canWatchDirectoryOrFile,
+  canWatchDirectoryOrFilePath,
   cartesianProduct,
   cast,
   chainBundle,
@@ -195091,6 +195252,7 @@ if (typeof console !== "undefined") {
   forEach,
   forEachAncestor,
   forEachAncestorDirectory,
+  forEachAncestorDirectoryStoppingAtGlobalCache,
   forEachChild,
   forEachChildRecursively,
   forEachEmittedFile,
@@ -195704,7 +195866,7 @@ if (typeof console !== "undefined") {
   isBooleanLiteral,
   isBreakOrContinueStatement,
   isBreakStatement,
-  isBuild,
+  isBuildCommand,
   isBuildInfoFile,
   isBuilderProgram,
   isBundle,
@@ -196619,6 +196781,7 @@ if (typeof console !== "undefined") {
   tagNamesAreEquivalent,
   takeWhile,
   targetOptionDeclaration,
+  targetToLibMap,
   testFormatSettings,
   textChangeRangeIsUnchanged,
   textChangeRangeNewSpan,
@@ -196712,6 +196875,7 @@ if (typeof console !== "undefined") {
   tryRemoveExtension,
   tryRemovePrefix,
   tryRemoveSuffix,
+  tscBuildOption,
   typeAcquisitionDeclarations,
   typeAliasNamePart,
   typeDirectiveIsEqualTo,