typescript 5.4.0-dev.20240213 → 5.4.0-dev.20240214

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20240213`;
+var version = `${versionMajorMinor}.0-dev.20240214`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -32496,7 +32496,7 @@ var Parser;
         if (!jsDocDiagnostics) {
           jsDocDiagnostics = [];
         }
-        jsDocDiagnostics.push(...parseDiagnostics);
+        addRange(jsDocDiagnostics, parseDiagnostics, saveParseDiagnosticsLength);
       }
       currentToken = saveToken;
       parseDiagnostics.length = saveParseDiagnosticsLength;
@@ -65650,7 +65650,7 @@ function createTypeChecker(host) {
   function hasMatchingArgument(expression, reference) {
     if (expression.arguments) {
       for (const argument of expression.arguments) {
-        if (isOrContainsMatchingReference(reference, argument) || optionalChainContainsReference(argument, reference)) {
+        if (isOrContainsMatchingReference(reference, argument) || optionalChainContainsReference(argument, reference) || getCandidateDiscriminantPropertyAccess(argument, reference)) {
           return true;
         }
       }
@@ -65660,6 +65660,36 @@ function createTypeChecker(host) {
     }
     return false;
   }
+  function getCandidateDiscriminantPropertyAccess(expr, reference) {
+    if (isBindingPattern(reference) || isFunctionExpressionOrArrowFunction(reference) || isObjectLiteralMethod(reference)) {
+      if (isIdentifier(expr)) {
+        const symbol = getResolvedSymbol(expr);
+        const declaration = symbol.valueDeclaration;
+        if (declaration && (isBindingElement(declaration) || isParameter(declaration)) && reference === declaration.parent && !declaration.initializer && !declaration.dotDotDotToken) {
+          return declaration;
+        }
+      }
+    } else if (isAccessExpression(expr)) {
+      if (isMatchingReference(reference, expr.expression)) {
+        return expr;
+      }
+    } else if (isIdentifier(expr)) {
+      const symbol = getResolvedSymbol(expr);
+      if (isConstantVariable(symbol)) {
+        const declaration = symbol.valueDeclaration;
+        if (isVariableDeclaration(declaration) && !declaration.type && declaration.initializer && isAccessExpression(declaration.initializer) && isMatchingReference(reference, declaration.initializer.expression)) {
+          return declaration.initializer;
+        }
+        if (isBindingElement(declaration) && !declaration.initializer) {
+          const parent = declaration.parent.parent;
+          if (isVariableDeclaration(parent) && !parent.type && parent.initializer && (isIdentifier(parent.initializer) || isAccessExpression(parent.initializer)) && isMatchingReference(reference, parent.initializer)) {
+            return declaration;
+          }
+        }
+      }
+    }
+    return void 0;
+  }
   function getFlowNodeId(flow) {
     if (!flow.id || flow.id < 0) {
       flow.id = nextFlowId;
@@ -66759,39 +66789,9 @@ function createTypeChecker(host) {
       }
       return result;
     }
-    function getCandidateDiscriminantPropertyAccess(expr) {
-      if (isBindingPattern(reference) || isFunctionExpressionOrArrowFunction(reference) || isObjectLiteralMethod(reference)) {
-        if (isIdentifier(expr)) {
-          const symbol = getResolvedSymbol(expr);
-          const declaration = symbol.valueDeclaration;
-          if (declaration && (isBindingElement(declaration) || isParameter(declaration)) && reference === declaration.parent && !declaration.initializer && !declaration.dotDotDotToken) {
-            return declaration;
-          }
-        }
-      } else if (isAccessExpression(expr)) {
-        if (isMatchingReference(reference, expr.expression)) {
-          return expr;
-        }
-      } else if (isIdentifier(expr)) {
-        const symbol = getResolvedSymbol(expr);
-        if (isConstantVariable(symbol)) {
-          const declaration = symbol.valueDeclaration;
-          if (isVariableDeclaration(declaration) && !declaration.type && declaration.initializer && isAccessExpression(declaration.initializer) && isMatchingReference(reference, declaration.initializer.expression)) {
-            return declaration.initializer;
-          }
-          if (isBindingElement(declaration) && !declaration.initializer) {
-            const parent = declaration.parent.parent;
-            if (isVariableDeclaration(parent) && !parent.type && parent.initializer && (isIdentifier(parent.initializer) || isAccessExpression(parent.initializer)) && isMatchingReference(reference, parent.initializer)) {
-              return declaration;
-            }
-          }
-        }
-      }
-      return void 0;
-    }
     function getDiscriminantPropertyAccess(expr, computedType) {
       if (declaredType.flags & 1048576 /* Union */ || computedType.flags & 1048576 /* Union */) {
-        const access = getCandidateDiscriminantPropertyAccess(expr);
+        const access = getCandidateDiscriminantPropertyAccess(expr, reference);
         if (access) {
           const name = getAccessedPropertyName(access);
           if (name) {

package/lib/tsserver.js

@@ -2340,7 +2340,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20240213`;
+var version = `${versionMajorMinor}.0-dev.20240214`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -36931,7 +36931,7 @@ var Parser;
         if (!jsDocDiagnostics) {
           jsDocDiagnostics = [];
         }
-        jsDocDiagnostics.push(...parseDiagnostics);
+        addRange(jsDocDiagnostics, parseDiagnostics, saveParseDiagnosticsLength);
       }
       currentToken = saveToken;
       parseDiagnostics.length = saveParseDiagnosticsLength;
@@ -70394,7 +70394,7 @@ function createTypeChecker(host) {
   function hasMatchingArgument(expression, reference) {
     if (expression.arguments) {
       for (const argument of expression.arguments) {
-        if (isOrContainsMatchingReference(reference, argument) || optionalChainContainsReference(argument, reference)) {
+        if (isOrContainsMatchingReference(reference, argument) || optionalChainContainsReference(argument, reference) || getCandidateDiscriminantPropertyAccess(argument, reference)) {
           return true;
         }
       }
@@ -70404,6 +70404,36 @@ function createTypeChecker(host) {
     }
     return false;
   }
+  function getCandidateDiscriminantPropertyAccess(expr, reference) {
+    if (isBindingPattern(reference) || isFunctionExpressionOrArrowFunction(reference) || isObjectLiteralMethod(reference)) {
+      if (isIdentifier(expr)) {
+        const symbol = getResolvedSymbol(expr);
+        const declaration = symbol.valueDeclaration;
+        if (declaration && (isBindingElement(declaration) || isParameter(declaration)) && reference === declaration.parent && !declaration.initializer && !declaration.dotDotDotToken) {
+          return declaration;
+        }
+      }
+    } else if (isAccessExpression(expr)) {
+      if (isMatchingReference(reference, expr.expression)) {
+        return expr;
+      }
+    } else if (isIdentifier(expr)) {
+      const symbol = getResolvedSymbol(expr);
+      if (isConstantVariable(symbol)) {
+        const declaration = symbol.valueDeclaration;
+        if (isVariableDeclaration(declaration) && !declaration.type && declaration.initializer && isAccessExpression(declaration.initializer) && isMatchingReference(reference, declaration.initializer.expression)) {
+          return declaration.initializer;
+        }
+        if (isBindingElement(declaration) && !declaration.initializer) {
+          const parent2 = declaration.parent.parent;
+          if (isVariableDeclaration(parent2) && !parent2.type && parent2.initializer && (isIdentifier(parent2.initializer) || isAccessExpression(parent2.initializer)) && isMatchingReference(reference, parent2.initializer)) {
+            return declaration;
+          }
+        }
+      }
+    }
+    return void 0;
+  }
   function getFlowNodeId(flow) {
     if (!flow.id || flow.id < 0) {
       flow.id = nextFlowId;
@@ -71503,39 +71533,9 @@ function createTypeChecker(host) {
       }
       return result;
     }
-    function getCandidateDiscriminantPropertyAccess(expr) {
-      if (isBindingPattern(reference) || isFunctionExpressionOrArrowFunction(reference) || isObjectLiteralMethod(reference)) {
-        if (isIdentifier(expr)) {
-          const symbol = getResolvedSymbol(expr);
-          const declaration = symbol.valueDeclaration;
-          if (declaration && (isBindingElement(declaration) || isParameter(declaration)) && reference === declaration.parent && !declaration.initializer && !declaration.dotDotDotToken) {
-            return declaration;
-          }
-        }
-      } else if (isAccessExpression(expr)) {
-        if (isMatchingReference(reference, expr.expression)) {
-          return expr;
-        }
-      } else if (isIdentifier(expr)) {
-        const symbol = getResolvedSymbol(expr);
-        if (isConstantVariable(symbol)) {
-          const declaration = symbol.valueDeclaration;
-          if (isVariableDeclaration(declaration) && !declaration.type && declaration.initializer && isAccessExpression(declaration.initializer) && isMatchingReference(reference, declaration.initializer.expression)) {
-            return declaration.initializer;
-          }
-          if (isBindingElement(declaration) && !declaration.initializer) {
-            const parent2 = declaration.parent.parent;
-            if (isVariableDeclaration(parent2) && !parent2.type && parent2.initializer && (isIdentifier(parent2.initializer) || isAccessExpression(parent2.initializer)) && isMatchingReference(reference, parent2.initializer)) {
-              return declaration;
-            }
-          }
-        }
-      }
-      return void 0;
-    }
     function getDiscriminantPropertyAccess(expr, computedType) {
       if (declaredType.flags & 1048576 /* Union */ || computedType.flags & 1048576 /* Union */) {
-        const access = getCandidateDiscriminantPropertyAccess(expr);
+        const access = getCandidateDiscriminantPropertyAccess(expr, reference);
         if (access) {
           const name = getAccessedPropertyName(access);
           if (name) {
@@ -178159,7 +178159,7 @@ var ScriptInfo = class {
         }
         break;
       default:
-        if (unorderedRemoveItem(this.containingProjects, project)) {
+        if (orderedRemoveItem(this.containingProjects, project)) {
           project.onFileAddedOrRemoved(this.isSymlink());
         }
         break;
@@ -181831,7 +181831,7 @@ var _ProjectService = class _ProjectService {
     );
     project.addRoot(info);
     if (info.containingProjects[0] !== project) {
-      info.detachFromProject(project);
+      orderedRemoveItem(info.containingProjects, project);
       info.containingProjects.unshift(project);
     }
     project.updateGraph();
@@ -182126,8 +182126,7 @@ var _ProjectService = class _ProjectService {
    * otherwise just file name
    */
   getConfigFileNameForFile(info) {
-    if (isOpenScriptInfo(info)) {
-      Debug.assert(info.isScriptOpen());
+    if (!isAncestorConfigFileInfo(info)) {
       const result = this.configFileForOpenFiles.get(info.path);
       if (result !== void 0)
         return result || void 0;
@@ -183122,11 +183121,13 @@ Dynamic files must always be opened with service's current directory or service
         } = this.hostConfiguration.preferences;
         this.hostConfiguration.preferences = { ...this.hostConfiguration.preferences, ...args.preferences };
         if (lazyConfiguredProjectsFromExternalProject && !this.hostConfiguration.preferences.lazyConfiguredProjectsFromExternalProject) {
-          this.configuredProjects.forEach((project) => {
-            if (project.hasExternalProjectRef() && project.pendingUpdateLevel === 2 /* Full */ && !this.pendingProjectUpdates.has(project.getProjectName())) {
-              project.updateGraph();
-            }
-          });
+          this.externalProjectToConfiguredProjectMap.forEach(
+            (projects) => projects.forEach((project) => {
+              if (!project.isClosed() && project.hasExternalProjectRef() && project.pendingUpdateLevel === 2 /* Full */ && !this.pendingProjectUpdates.has(project.getProjectName())) {
+                project.updateGraph();
+              }
+            })
+          );
         }
         if (includePackageJsonAutoImports !== args.preferences.includePackageJsonAutoImports) {
           this.forEachProject((project) => {
@@ -183711,23 +183712,20 @@ Dynamic files must always be opened with service's current directory or service
       scriptInfo.editContent(change.span.start, change.span.start + change.span.length, change.newText);
     }
   }
-  closeConfiguredProjectReferencedFromExternalProject(configFile) {
-    const configuredProject = this.findConfiguredProjectByProjectName(configFile);
-    if (configuredProject) {
-      configuredProject.deleteExternalProjectReference();
-      if (!configuredProject.hasOpenRef()) {
-        this.removeProject(configuredProject);
-        return;
+  closeConfiguredProjectReferencedFromExternalProject(configuredProjects) {
+    configuredProjects == null ? void 0 : configuredProjects.forEach((configuredProject) => {
+      if (!configuredProject.isClosed()) {
+        configuredProject.deleteExternalProjectReference();
+        if (!configuredProject.hasOpenRef())
+          this.removeProject(configuredProject);
       }
-    }
+    });
   }
   closeExternalProject(uncheckedFileName, print) {
     const fileName = toNormalizedPath(uncheckedFileName);
-    const configFiles = this.externalProjectToConfiguredProjectMap.get(fileName);
-    if (configFiles) {
-      for (const configFile of configFiles) {
-        this.closeConfiguredProjectReferencedFromExternalProject(configFile);
-      }
+    const configuredProjects = this.externalProjectToConfiguredProjectMap.get(fileName);
+    if (configuredProjects) {
+      this.closeConfiguredProjectReferencedFromExternalProject(configuredProjects);
       this.externalProjectToConfiguredProjectMap.delete(fileName);
     } else {
       const externalProject = this.findExternalProjectByProjectName(uncheckedFileName);
@@ -183767,16 +183765,18 @@ Dynamic files must always be opened with service's current directory or service
     this.safelist = defaultTypeSafeList;
   }
   applySafeList(proj) {
-    const { rootFiles } = proj;
     const typeAcquisition = proj.typeAcquisition;
     Debug.assert(!!typeAcquisition, "proj.typeAcquisition should be set by now");
+    const result = this.applySafeListWorker(proj, proj.rootFiles, typeAcquisition);
+    return (result == null ? void 0 : result.excludedFiles) ?? [];
+  }
+  applySafeListWorker(proj, rootFiles, typeAcquisition) {
     if (typeAcquisition.enable === false || typeAcquisition.disableFilenameBasedTypeAcquisition) {
-      return [];
+      return void 0;
     }
     const typeAcqInclude = typeAcquisition.include || (typeAcquisition.include = []);
     const excludeRules = [];
     const normalizedNames = rootFiles.map((f) => normalizeSlashes(f.fileName));
-    const excludedFiles = [];
     for (const name of Object.keys(this.safelist)) {
       const rule2 = this.safelist[name];
       for (const root of normalizedNames) {
@@ -183817,12 +183817,12 @@ Dynamic files must always be opened with service's current directory or service
       }
     }
     const excludeRegexes = excludeRules.map((e) => new RegExp(e, "i"));
-    const filesToKeep = [];
-    for (let i = 0; i < proj.rootFiles.length; i++) {
+    let filesToKeep;
+    let excludedFiles;
+    for (let i = 0; i < rootFiles.length; i++) {
       if (excludeRegexes.some((re) => re.test(normalizedNames[i]))) {
-        excludedFiles.push(normalizedNames[i]);
+        addExcludedFile(i);
       } else {
-        let exclude = false;
         if (typeAcquisition.enable) {
           const baseName = getBaseFileName(toFileNameLowerCase(normalizedNames[i]));
           if (fileExtensionIs(baseName, "js")) {
@@ -183831,120 +183831,91 @@ Dynamic files must always be opened with service's current directory or service
             const typeName = this.legacySafelist.get(cleanedTypingName);
             if (typeName !== void 0) {
               this.logger.info(`Excluded '${normalizedNames[i]}' because it matched ${cleanedTypingName} from the legacy safelist`);
-              excludedFiles.push(normalizedNames[i]);
-              exclude = true;
+              addExcludedFile(i);
               if (!typeAcqInclude.includes(typeName)) {
                 typeAcqInclude.push(typeName);
               }
+              continue;
             }
           }
         }
-        if (!exclude) {
-          if (/^.+[.-]min\.js$/.test(normalizedNames[i])) {
-            excludedFiles.push(normalizedNames[i]);
-          } else {
-            filesToKeep.push(proj.rootFiles[i]);
-          }
+        if (/^.+[.-]min\.js$/.test(normalizedNames[i])) {
+          addExcludedFile(i);
+        } else {
+          filesToKeep == null ? void 0 : filesToKeep.push(rootFiles[i]);
         }
       }
     }
-    proj.rootFiles = filesToKeep;
-    return excludedFiles;
+    return excludedFiles ? {
+      rootFiles: filesToKeep,
+      excludedFiles
+    } : void 0;
+    function addExcludedFile(index) {
+      if (!excludedFiles) {
+        Debug.assert(!filesToKeep);
+        filesToKeep = rootFiles.slice(0, index);
+        excludedFiles = [];
+      }
+      excludedFiles.push(normalizedNames[index]);
+    }
   }
   openExternalProject(proj, print) {
-    proj.typeAcquisition = proj.typeAcquisition || {};
-    proj.typeAcquisition.include = proj.typeAcquisition.include || [];
-    proj.typeAcquisition.exclude = proj.typeAcquisition.exclude || [];
-    if (proj.typeAcquisition.enable === void 0) {
-      proj.typeAcquisition.enable = hasNoTypeScriptSource(proj.rootFiles.map((f) => f.fileName));
-    }
-    const excludedFiles = this.applySafeList(proj);
-    let tsConfigFiles;
-    const rootFiles = [];
+    const existingExternalProject = this.findExternalProjectByProjectName(proj.projectFileName);
+    const existingConfiguredProjects = this.externalProjectToConfiguredProjectMap.get(proj.projectFileName);
+    let configuredProjects;
+    let rootFiles = [];
     for (const file of proj.rootFiles) {
       const normalized = toNormalizedPath(file.fileName);
       if (getBaseConfigFileName(normalized)) {
         if (this.serverMode === 0 /* Semantic */ && this.host.fileExists(normalized)) {
-          (tsConfigFiles || (tsConfigFiles = [])).push(normalized);
+          let project = this.findConfiguredProjectByProjectName(normalized);
+          if (!project) {
+            project = this.getHostPreferences().lazyConfiguredProjectsFromExternalProject ? this.createConfiguredProjectWithDelayLoad(normalized, `Creating configured project in external project: ${proj.projectFileName}`) : this.createLoadAndUpdateConfiguredProject(normalized, `Creating configured project in external project: ${proj.projectFileName}`);
+          }
+          if (!(existingConfiguredProjects == null ? void 0 : existingConfiguredProjects.has(project))) {
+            project.addExternalProjectReference();
+          }
+          (configuredProjects ?? (configuredProjects = /* @__PURE__ */ new Set())).add(project);
+          existingConfiguredProjects == null ? void 0 : existingConfiguredProjects.delete(project);
         }
       } else {
         rootFiles.push(file);
       }
     }
-    if (tsConfigFiles) {
-      tsConfigFiles.sort();
-    }
-    const externalProject = this.findExternalProjectByProjectName(proj.projectFileName);
-    let exisingConfigFiles;
-    if (externalProject) {
-      externalProject.excludedFiles = excludedFiles;
-      if (!tsConfigFiles) {
+    if (configuredProjects) {
+      this.externalProjectToConfiguredProjectMap.set(proj.projectFileName, configuredProjects);
+      if (existingExternalProject)
+        this.removeProject(existingExternalProject);
+    } else {
+      this.externalProjectToConfiguredProjectMap.delete(proj.projectFileName);
+      const typeAcquisition = proj.typeAcquisition || {};
+      typeAcquisition.include = typeAcquisition.include || [];
+      typeAcquisition.exclude = typeAcquisition.exclude || [];
+      if (typeAcquisition.enable === void 0) {
+        typeAcquisition.enable = hasNoTypeScriptSource(rootFiles.map((f) => f.fileName));
+      }
+      const excludeResult = this.applySafeListWorker(proj, rootFiles, typeAcquisition);
+      const excludedFiles = (excludeResult == null ? void 0 : excludeResult.excludedFiles) ?? [];
+      rootFiles = (excludeResult == null ? void 0 : excludeResult.rootFiles) ?? rootFiles;
+      if (existingExternalProject) {
+        existingExternalProject.excludedFiles = excludedFiles;
         const compilerOptions = convertCompilerOptions(proj.options);
-        const watchOptionsAndErrors = convertWatchOptions(proj.options, externalProject.getCurrentDirectory());
-        const lastFileExceededProgramSize = this.getFilenameForExceededTotalSizeLimitForNonTsFiles(proj.projectFileName, compilerOptions, proj.rootFiles, externalFilePropertyReader);
+        const watchOptionsAndErrors = convertWatchOptions(proj.options, existingExternalProject.getCurrentDirectory());
+        const lastFileExceededProgramSize = this.getFilenameForExceededTotalSizeLimitForNonTsFiles(proj.projectFileName, compilerOptions, rootFiles, externalFilePropertyReader);
         if (lastFileExceededProgramSize) {
-          externalProject.disableLanguageService(lastFileExceededProgramSize);
+          existingExternalProject.disableLanguageService(lastFileExceededProgramSize);
         } else {
-          externalProject.enableLanguageService();
+          existingExternalProject.enableLanguageService();
         }
-        externalProject.setProjectErrors(watchOptionsAndErrors == null ? void 0 : watchOptionsAndErrors.errors);
-        this.updateRootAndOptionsOfNonInferredProject(externalProject, proj.rootFiles, externalFilePropertyReader, compilerOptions, proj.typeAcquisition, proj.options.compileOnSave, watchOptionsAndErrors == null ? void 0 : watchOptionsAndErrors.watchOptions);
-        externalProject.updateGraph();
-        if (print)
-          this.printProjects();
-        return;
-      }
-      this.closeExternalProject(
-        proj.projectFileName,
-        /*print*/
-        false
-      );
-    } else if (this.externalProjectToConfiguredProjectMap.get(proj.projectFileName)) {
-      if (!tsConfigFiles) {
-        this.closeExternalProject(
-          proj.projectFileName,
-          /*print*/
-          false
-        );
+        existingExternalProject.setProjectErrors(watchOptionsAndErrors == null ? void 0 : watchOptionsAndErrors.errors);
+        this.updateRootAndOptionsOfNonInferredProject(existingExternalProject, rootFiles, externalFilePropertyReader, compilerOptions, typeAcquisition, proj.options.compileOnSave, watchOptionsAndErrors == null ? void 0 : watchOptionsAndErrors.watchOptions);
+        existingExternalProject.updateGraph();
       } else {
-        const oldConfigFiles = this.externalProjectToConfiguredProjectMap.get(proj.projectFileName);
-        let iNew = 0;
-        let iOld = 0;
-        while (iNew < tsConfigFiles.length && iOld < oldConfigFiles.length) {
-          const newConfig = tsConfigFiles[iNew];
-          const oldConfig = oldConfigFiles[iOld];
-          if (oldConfig < newConfig) {
-            this.closeConfiguredProjectReferencedFromExternalProject(oldConfig);
-            iOld++;
-          } else if (oldConfig > newConfig) {
-            iNew++;
-          } else {
-            (exisingConfigFiles || (exisingConfigFiles = [])).push(oldConfig);
-            iOld++;
-            iNew++;
-          }
-        }
-        for (let i = iOld; i < oldConfigFiles.length; i++) {
-          this.closeConfiguredProjectReferencedFromExternalProject(oldConfigFiles[i]);
-        }
+        const project = this.createExternalProject(proj.projectFileName, rootFiles, proj.options, typeAcquisition, excludedFiles);
+        project.updateGraph();
       }
     }
-    if (tsConfigFiles) {
-      this.externalProjectToConfiguredProjectMap.set(proj.projectFileName, tsConfigFiles);
-      for (const tsconfigFile of tsConfigFiles) {
-        let project = this.findConfiguredProjectByProjectName(tsconfigFile);
-        if (!project) {
-          project = this.getHostPreferences().lazyConfiguredProjectsFromExternalProject ? this.createConfiguredProjectWithDelayLoad(tsconfigFile, `Creating configured project in external project: ${proj.projectFileName}`) : this.createLoadAndUpdateConfiguredProject(tsconfigFile, `Creating configured project in external project: ${proj.projectFileName}`);
-        }
-        if (project && !contains(exisingConfigFiles, tsconfigFile)) {
-          project.addExternalProjectReference();
-        }
-      }
-    } else {
-      this.externalProjectToConfiguredProjectMap.delete(proj.projectFileName);
-      const project = this.createExternalProject(proj.projectFileName, rootFiles, proj.options, proj.typeAcquisition, excludedFiles);
-      project.updateGraph();
-    }
+    this.closeConfiguredProjectReferencedFromExternalProject(existingConfiguredProjects);
     if (print)
       this.printProjects();
   }

package/lib/typescript.d.ts

@@ -3906,6 +3906,7 @@ declare namespace ts {
             private static escapeFilenameForRegex;
             resetSafeList(): void;
             applySafeList(proj: protocol.ExternalProject): NormalizedPath[];
+            private applySafeListWorker;
             openExternalProject(proj: protocol.ExternalProject): void;
             hasDeferredExtension(): boolean;
             private enableRequestedPluginsAsync;

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.4";
-      version = `${versionMajorMinor}.0-dev.20240213`;
+      version = `${versionMajorMinor}.0-dev.20240214`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -35009,7 +35009,7 @@ ${lanes.join("\n")}
               if (!jsDocDiagnostics) {
                 jsDocDiagnostics = [];
               }
-              jsDocDiagnostics.push(...parseDiagnostics);
+              addRange(jsDocDiagnostics, parseDiagnostics, saveParseDiagnosticsLength);
             }
             currentToken = saveToken;
             parseDiagnostics.length = saveParseDiagnosticsLength;
@@ -68149,7 +68149,7 @@ ${lanes.join("\n")}
     function hasMatchingArgument(expression, reference) {
       if (expression.arguments) {
         for (const argument of expression.arguments) {
-          if (isOrContainsMatchingReference(reference, argument) || optionalChainContainsReference(argument, reference)) {
+          if (isOrContainsMatchingReference(reference, argument) || optionalChainContainsReference(argument, reference) || getCandidateDiscriminantPropertyAccess(argument, reference)) {
             return true;
           }
         }
@@ -68159,6 +68159,36 @@ ${lanes.join("\n")}
       }
       return false;
     }
+    function getCandidateDiscriminantPropertyAccess(expr, reference) {
+      if (isBindingPattern(reference) || isFunctionExpressionOrArrowFunction(reference) || isObjectLiteralMethod(reference)) {
+        if (isIdentifier(expr)) {
+          const symbol = getResolvedSymbol(expr);
+          const declaration = symbol.valueDeclaration;
+          if (declaration && (isBindingElement(declaration) || isParameter(declaration)) && reference === declaration.parent && !declaration.initializer && !declaration.dotDotDotToken) {
+            return declaration;
+          }
+        }
+      } else if (isAccessExpression(expr)) {
+        if (isMatchingReference(reference, expr.expression)) {
+          return expr;
+        }
+      } else if (isIdentifier(expr)) {
+        const symbol = getResolvedSymbol(expr);
+        if (isConstantVariable(symbol)) {
+          const declaration = symbol.valueDeclaration;
+          if (isVariableDeclaration(declaration) && !declaration.type && declaration.initializer && isAccessExpression(declaration.initializer) && isMatchingReference(reference, declaration.initializer.expression)) {
+            return declaration.initializer;
+          }
+          if (isBindingElement(declaration) && !declaration.initializer) {
+            const parent2 = declaration.parent.parent;
+            if (isVariableDeclaration(parent2) && !parent2.type && parent2.initializer && (isIdentifier(parent2.initializer) || isAccessExpression(parent2.initializer)) && isMatchingReference(reference, parent2.initializer)) {
+              return declaration;
+            }
+          }
+        }
+      }
+      return void 0;
+    }
     function getFlowNodeId(flow) {
       if (!flow.id || flow.id < 0) {
         flow.id = nextFlowId;
@@ -69258,39 +69288,9 @@ ${lanes.join("\n")}
         }
         return result;
       }
-      function getCandidateDiscriminantPropertyAccess(expr) {
-        if (isBindingPattern(reference) || isFunctionExpressionOrArrowFunction(reference) || isObjectLiteralMethod(reference)) {
-          if (isIdentifier(expr)) {
-            const symbol = getResolvedSymbol(expr);
-            const declaration = symbol.valueDeclaration;
-            if (declaration && (isBindingElement(declaration) || isParameter(declaration)) && reference === declaration.parent && !declaration.initializer && !declaration.dotDotDotToken) {
-              return declaration;
-            }
-          }
-        } else if (isAccessExpression(expr)) {
-          if (isMatchingReference(reference, expr.expression)) {
-            return expr;
-          }
-        } else if (isIdentifier(expr)) {
-          const symbol = getResolvedSymbol(expr);
-          if (isConstantVariable(symbol)) {
-            const declaration = symbol.valueDeclaration;
-            if (isVariableDeclaration(declaration) && !declaration.type && declaration.initializer && isAccessExpression(declaration.initializer) && isMatchingReference(reference, declaration.initializer.expression)) {
-              return declaration.initializer;
-            }
-            if (isBindingElement(declaration) && !declaration.initializer) {
-              const parent2 = declaration.parent.parent;
-              if (isVariableDeclaration(parent2) && !parent2.type && parent2.initializer && (isIdentifier(parent2.initializer) || isAccessExpression(parent2.initializer)) && isMatchingReference(reference, parent2.initializer)) {
-                return declaration;
-              }
-            }
-          }
-        }
-        return void 0;
-      }
       function getDiscriminantPropertyAccess(expr, computedType) {
         if (declaredType.flags & 1048576 /* Union */ || computedType.flags & 1048576 /* Union */) {
-          const access = getCandidateDiscriminantPropertyAccess(expr);
+          const access = getCandidateDiscriminantPropertyAccess(expr, reference);
           if (access) {
             const name = getAccessedPropertyName(access);
             if (name) {
@@ -175443,7 +175443,7 @@ ${options.prefix}` : "\n" : options.prefix
               }
               break;
             default:
-              if (unorderedRemoveItem(this.containingProjects, project)) {
+              if (orderedRemoveItem(this.containingProjects, project)) {
                 project.onFileAddedOrRemoved(this.isSymlink());
               }
               break;
@@ -179152,7 +179152,7 @@ ${options.prefix}` : "\n" : options.prefix
           );
           project.addRoot(info);
           if (info.containingProjects[0] !== project) {
-            info.detachFromProject(project);
+            orderedRemoveItem(info.containingProjects, project);
             info.containingProjects.unshift(project);
           }
           project.updateGraph();
@@ -179447,8 +179447,7 @@ ${options.prefix}` : "\n" : options.prefix
          * otherwise just file name
          */
         getConfigFileNameForFile(info) {
-          if (isOpenScriptInfo(info)) {
-            Debug.assert(info.isScriptOpen());
+          if (!isAncestorConfigFileInfo(info)) {
             const result = this.configFileForOpenFiles.get(info.path);
             if (result !== void 0)
               return result || void 0;
@@ -180443,11 +180442,13 @@ Dynamic files must always be opened with service's current directory or service
               } = this.hostConfiguration.preferences;
               this.hostConfiguration.preferences = { ...this.hostConfiguration.preferences, ...args.preferences };
               if (lazyConfiguredProjectsFromExternalProject && !this.hostConfiguration.preferences.lazyConfiguredProjectsFromExternalProject) {
-                this.configuredProjects.forEach((project) => {
-                  if (project.hasExternalProjectRef() && project.pendingUpdateLevel === 2 /* Full */ && !this.pendingProjectUpdates.has(project.getProjectName())) {
-                    project.updateGraph();
-                  }
-                });
+                this.externalProjectToConfiguredProjectMap.forEach(
+                  (projects) => projects.forEach((project) => {
+                    if (!project.isClosed() && project.hasExternalProjectRef() && project.pendingUpdateLevel === 2 /* Full */ && !this.pendingProjectUpdates.has(project.getProjectName())) {
+                      project.updateGraph();
+                    }
+                  })
+                );
               }
               if (includePackageJsonAutoImports !== args.preferences.includePackageJsonAutoImports) {
                 this.forEachProject((project) => {
@@ -181032,23 +181033,20 @@ Dynamic files must always be opened with service's current directory or service
             scriptInfo.editContent(change.span.start, change.span.start + change.span.length, change.newText);
           }
         }
-        closeConfiguredProjectReferencedFromExternalProject(configFile) {
-          const configuredProject = this.findConfiguredProjectByProjectName(configFile);
-          if (configuredProject) {
-            configuredProject.deleteExternalProjectReference();
-            if (!configuredProject.hasOpenRef()) {
-              this.removeProject(configuredProject);
-              return;
+        closeConfiguredProjectReferencedFromExternalProject(configuredProjects) {
+          configuredProjects == null ? void 0 : configuredProjects.forEach((configuredProject) => {
+            if (!configuredProject.isClosed()) {
+              configuredProject.deleteExternalProjectReference();
+              if (!configuredProject.hasOpenRef())
+                this.removeProject(configuredProject);
             }
-          }
+          });
         }
         closeExternalProject(uncheckedFileName, print) {
           const fileName = toNormalizedPath(uncheckedFileName);
-          const configFiles = this.externalProjectToConfiguredProjectMap.get(fileName);
-          if (configFiles) {
-            for (const configFile of configFiles) {
-              this.closeConfiguredProjectReferencedFromExternalProject(configFile);
-            }
+          const configuredProjects = this.externalProjectToConfiguredProjectMap.get(fileName);
+          if (configuredProjects) {
+            this.closeConfiguredProjectReferencedFromExternalProject(configuredProjects);
             this.externalProjectToConfiguredProjectMap.delete(fileName);
           } else {
             const externalProject = this.findExternalProjectByProjectName(uncheckedFileName);
@@ -181088,16 +181086,18 @@ Dynamic files must always be opened with service's current directory or service
           this.safelist = defaultTypeSafeList;
         }
         applySafeList(proj) {
-          const { rootFiles } = proj;
           const typeAcquisition = proj.typeAcquisition;
           Debug.assert(!!typeAcquisition, "proj.typeAcquisition should be set by now");
+          const result = this.applySafeListWorker(proj, proj.rootFiles, typeAcquisition);
+          return (result == null ? void 0 : result.excludedFiles) ?? [];
+        }
+        applySafeListWorker(proj, rootFiles, typeAcquisition) {
           if (typeAcquisition.enable === false || typeAcquisition.disableFilenameBasedTypeAcquisition) {
-            return [];
+            return void 0;
           }
           const typeAcqInclude = typeAcquisition.include || (typeAcquisition.include = []);
           const excludeRules = [];
           const normalizedNames = rootFiles.map((f) => normalizeSlashes(f.fileName));
-          const excludedFiles = [];
           for (const name of Object.keys(this.safelist)) {
             const rule2 = this.safelist[name];
             for (const root of normalizedNames) {
@@ -181138,12 +181138,12 @@ Dynamic files must always be opened with service's current directory or service
             }
           }
           const excludeRegexes = excludeRules.map((e) => new RegExp(e, "i"));
-          const filesToKeep = [];
-          for (let i = 0; i < proj.rootFiles.length; i++) {
+          let filesToKeep;
+          let excludedFiles;
+          for (let i = 0; i < rootFiles.length; i++) {
             if (excludeRegexes.some((re) => re.test(normalizedNames[i]))) {
-              excludedFiles.push(normalizedNames[i]);
+              addExcludedFile(i);
             } else {
-              let exclude = false;
               if (typeAcquisition.enable) {
                 const baseName = getBaseFileName(toFileNameLowerCase(normalizedNames[i]));
                 if (fileExtensionIs(baseName, "js")) {
@@ -181152,120 +181152,91 @@ Dynamic files must always be opened with service's current directory or service
                   const typeName = this.legacySafelist.get(cleanedTypingName);
                   if (typeName !== void 0) {
                     this.logger.info(`Excluded '${normalizedNames[i]}' because it matched ${cleanedTypingName} from the legacy safelist`);
-                    excludedFiles.push(normalizedNames[i]);
-                    exclude = true;
+                    addExcludedFile(i);
                     if (!typeAcqInclude.includes(typeName)) {
                       typeAcqInclude.push(typeName);
                     }
+                    continue;
                   }
                 }
               }
-              if (!exclude) {
-                if (/^.+[.-]min\.js$/.test(normalizedNames[i])) {
-                  excludedFiles.push(normalizedNames[i]);
-                } else {
-                  filesToKeep.push(proj.rootFiles[i]);
-                }
+              if (/^.+[.-]min\.js$/.test(normalizedNames[i])) {
+                addExcludedFile(i);
+              } else {
+                filesToKeep == null ? void 0 : filesToKeep.push(rootFiles[i]);
               }
             }
           }
-          proj.rootFiles = filesToKeep;
-          return excludedFiles;
+          return excludedFiles ? {
+            rootFiles: filesToKeep,
+            excludedFiles
+          } : void 0;
+          function addExcludedFile(index) {
+            if (!excludedFiles) {
+              Debug.assert(!filesToKeep);
+              filesToKeep = rootFiles.slice(0, index);
+              excludedFiles = [];
+            }
+            excludedFiles.push(normalizedNames[index]);
+          }
         }
         openExternalProject(proj, print) {
-          proj.typeAcquisition = proj.typeAcquisition || {};
-          proj.typeAcquisition.include = proj.typeAcquisition.include || [];
-          proj.typeAcquisition.exclude = proj.typeAcquisition.exclude || [];
-          if (proj.typeAcquisition.enable === void 0) {
-            proj.typeAcquisition.enable = hasNoTypeScriptSource(proj.rootFiles.map((f) => f.fileName));
-          }
-          const excludedFiles = this.applySafeList(proj);
-          let tsConfigFiles;
-          const rootFiles = [];
+          const existingExternalProject = this.findExternalProjectByProjectName(proj.projectFileName);
+          const existingConfiguredProjects = this.externalProjectToConfiguredProjectMap.get(proj.projectFileName);
+          let configuredProjects;
+          let rootFiles = [];
           for (const file of proj.rootFiles) {
             const normalized = toNormalizedPath(file.fileName);
             if (getBaseConfigFileName(normalized)) {
               if (this.serverMode === 0 /* Semantic */ && this.host.fileExists(normalized)) {
-                (tsConfigFiles || (tsConfigFiles = [])).push(normalized);
+                let project = this.findConfiguredProjectByProjectName(normalized);
+                if (!project) {
+                  project = this.getHostPreferences().lazyConfiguredProjectsFromExternalProject ? this.createConfiguredProjectWithDelayLoad(normalized, `Creating configured project in external project: ${proj.projectFileName}`) : this.createLoadAndUpdateConfiguredProject(normalized, `Creating configured project in external project: ${proj.projectFileName}`);
+                }
+                if (!(existingConfiguredProjects == null ? void 0 : existingConfiguredProjects.has(project))) {
+                  project.addExternalProjectReference();
+                }
+                (configuredProjects ?? (configuredProjects = /* @__PURE__ */ new Set())).add(project);
+                existingConfiguredProjects == null ? void 0 : existingConfiguredProjects.delete(project);
               }
             } else {
               rootFiles.push(file);
             }
           }
-          if (tsConfigFiles) {
-            tsConfigFiles.sort();
-          }
-          const externalProject = this.findExternalProjectByProjectName(proj.projectFileName);
-          let exisingConfigFiles;
-          if (externalProject) {
-            externalProject.excludedFiles = excludedFiles;
-            if (!tsConfigFiles) {
+          if (configuredProjects) {
+            this.externalProjectToConfiguredProjectMap.set(proj.projectFileName, configuredProjects);
+            if (existingExternalProject)
+              this.removeProject(existingExternalProject);
+          } else {
+            this.externalProjectToConfiguredProjectMap.delete(proj.projectFileName);
+            const typeAcquisition = proj.typeAcquisition || {};
+            typeAcquisition.include = typeAcquisition.include || [];
+            typeAcquisition.exclude = typeAcquisition.exclude || [];
+            if (typeAcquisition.enable === void 0) {
+              typeAcquisition.enable = hasNoTypeScriptSource(rootFiles.map((f) => f.fileName));
+            }
+            const excludeResult = this.applySafeListWorker(proj, rootFiles, typeAcquisition);
+            const excludedFiles = (excludeResult == null ? void 0 : excludeResult.excludedFiles) ?? [];
+            rootFiles = (excludeResult == null ? void 0 : excludeResult.rootFiles) ?? rootFiles;
+            if (existingExternalProject) {
+              existingExternalProject.excludedFiles = excludedFiles;
               const compilerOptions = convertCompilerOptions(proj.options);
-              const watchOptionsAndErrors = convertWatchOptions(proj.options, externalProject.getCurrentDirectory());
-              const lastFileExceededProgramSize = this.getFilenameForExceededTotalSizeLimitForNonTsFiles(proj.projectFileName, compilerOptions, proj.rootFiles, externalFilePropertyReader);
+              const watchOptionsAndErrors = convertWatchOptions(proj.options, existingExternalProject.getCurrentDirectory());
+              const lastFileExceededProgramSize = this.getFilenameForExceededTotalSizeLimitForNonTsFiles(proj.projectFileName, compilerOptions, rootFiles, externalFilePropertyReader);
               if (lastFileExceededProgramSize) {
-                externalProject.disableLanguageService(lastFileExceededProgramSize);
+                existingExternalProject.disableLanguageService(lastFileExceededProgramSize);
               } else {
-                externalProject.enableLanguageService();
+                existingExternalProject.enableLanguageService();
               }
-              externalProject.setProjectErrors(watchOptionsAndErrors == null ? void 0 : watchOptionsAndErrors.errors);
-              this.updateRootAndOptionsOfNonInferredProject(externalProject, proj.rootFiles, externalFilePropertyReader, compilerOptions, proj.typeAcquisition, proj.options.compileOnSave, watchOptionsAndErrors == null ? void 0 : watchOptionsAndErrors.watchOptions);
-              externalProject.updateGraph();
-              if (print)
-                this.printProjects();
-              return;
-            }
-            this.closeExternalProject(
-              proj.projectFileName,
-              /*print*/
-              false
-            );
-          } else if (this.externalProjectToConfiguredProjectMap.get(proj.projectFileName)) {
-            if (!tsConfigFiles) {
-              this.closeExternalProject(
-                proj.projectFileName,
-                /*print*/
-                false
-              );
+              existingExternalProject.setProjectErrors(watchOptionsAndErrors == null ? void 0 : watchOptionsAndErrors.errors);
+              this.updateRootAndOptionsOfNonInferredProject(existingExternalProject, rootFiles, externalFilePropertyReader, compilerOptions, typeAcquisition, proj.options.compileOnSave, watchOptionsAndErrors == null ? void 0 : watchOptionsAndErrors.watchOptions);
+              existingExternalProject.updateGraph();
             } else {
-              const oldConfigFiles = this.externalProjectToConfiguredProjectMap.get(proj.projectFileName);
-              let iNew = 0;
-              let iOld = 0;
-              while (iNew < tsConfigFiles.length && iOld < oldConfigFiles.length) {
-                const newConfig = tsConfigFiles[iNew];
-                const oldConfig = oldConfigFiles[iOld];
-                if (oldConfig < newConfig) {
-                  this.closeConfiguredProjectReferencedFromExternalProject(oldConfig);
-                  iOld++;
-                } else if (oldConfig > newConfig) {
-                  iNew++;
-                } else {
-                  (exisingConfigFiles || (exisingConfigFiles = [])).push(oldConfig);
-                  iOld++;
-                  iNew++;
-                }
-              }
-              for (let i = iOld; i < oldConfigFiles.length; i++) {
-                this.closeConfiguredProjectReferencedFromExternalProject(oldConfigFiles[i]);
-              }
+              const project = this.createExternalProject(proj.projectFileName, rootFiles, proj.options, typeAcquisition, excludedFiles);
+              project.updateGraph();
             }
           }
-          if (tsConfigFiles) {
-            this.externalProjectToConfiguredProjectMap.set(proj.projectFileName, tsConfigFiles);
-            for (const tsconfigFile of tsConfigFiles) {
-              let project = this.findConfiguredProjectByProjectName(tsconfigFile);
-              if (!project) {
-                project = this.getHostPreferences().lazyConfiguredProjectsFromExternalProject ? this.createConfiguredProjectWithDelayLoad(tsconfigFile, `Creating configured project in external project: ${proj.projectFileName}`) : this.createLoadAndUpdateConfiguredProject(tsconfigFile, `Creating configured project in external project: ${proj.projectFileName}`);
-              }
-              if (project && !contains(exisingConfigFiles, tsconfigFile)) {
-                project.addExternalProjectReference();
-              }
-            }
-          } else {
-            this.externalProjectToConfiguredProjectMap.delete(proj.projectFileName);
-            const project = this.createExternalProject(proj.projectFileName, rootFiles, proj.options, proj.typeAcquisition, excludedFiles);
-            project.updateGraph();
-          }
+          this.closeConfiguredProjectReferencedFromExternalProject(existingConfiguredProjects);
           if (print)
             this.printProjects();
         }

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20240213`;
+var version = `${versionMajorMinor}.0-dev.20240214`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -24326,7 +24326,7 @@ var Parser;
         if (!jsDocDiagnostics) {
           jsDocDiagnostics = [];
         }
-        jsDocDiagnostics.push(...parseDiagnostics);
+        addRange(jsDocDiagnostics, parseDiagnostics, saveParseDiagnosticsLength);
       }
       currentToken = saveToken;
       parseDiagnostics.length = saveParseDiagnosticsLength;

package/package.json

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