typescript 5.6.0-dev.20240724 → 5.6.0-dev.20240726

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.6";
-var version = `${versionMajorMinor}.0-dev.20240724`;
+var version = `${versionMajorMinor}.0-dev.20240726`;
 
 // src/compiler/core.ts
 var emptyArray = [];

package/lib/typescript.d.ts

@@ -3268,6 +3268,7 @@ declare namespace ts {
             private delayUpdateProjectsOfScriptInfoPath;
             private handleDeletedFile;
             private watchWildcardDirectory;
+            private onWildCardDirectoryWatcherInvoke;
             private delayUpdateProjectsFromParsedConfigOnConfigFileChange;
             private onConfigFileChanged;
             private removeProject;
@@ -3338,6 +3339,7 @@ declare namespace ts {
             private ensureProjectChildren;
             private cleanupConfiguredProjects;
             private cleanupProjectsAndScriptInfos;
+            private tryInvokeWildCardDirectories;
             openClientFileWithNormalizedPath(fileName: NormalizedPath, fileContent?: string, scriptKind?: ScriptKind, hasMixedContent?: boolean, projectRootPath?: NormalizedPath): OpenConfiguredProjectResult;
             private removeOrphanScriptInfos;
             private telemetryOnOpenFile;

package/lib/typescript.js

@@ -2259,7 +2259,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.6";
-var version = `${versionMajorMinor}.0-dev.20240724`;
+var version = `${versionMajorMinor}.0-dev.20240726`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -150115,6 +150115,7 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
     synchronizeHostData();
     Debug.assert(args.type === "file");
     const sourceFile = getValidSourceFile(args.fileName);
+    if (containsParseError(sourceFile)) return emptyArray;
     const formatContext = ts_formatting_exports.getFormatContext(formatOptions, host);
     const mode = args.mode ?? (args.skipDestructiveCodeActions ? "SortAndCombine" /* SortAndCombine */ : "All" /* All */);
     return ts_OrganizeImports_exports.organizeImports(sourceFile, formatContext, host, program, preferences, mode);
@@ -157350,7 +157351,7 @@ function getInfo10(sourceFile, tokenPos, errorCode, checker, program) {
     const moduleDeclaration = find(symbol.declarations, isModuleDeclaration);
     const moduleDeclarationSourceFile = moduleDeclaration == null ? void 0 : moduleDeclaration.getSourceFile();
     if (moduleDeclaration && moduleDeclarationSourceFile && !isSourceFileFromLibrary(program, moduleDeclarationSourceFile)) {
-      return { kind: 2 /* Function */, token, call: parent2.parent, sourceFile, modifierFlags: 32 /* Export */, parentDeclaration: moduleDeclaration };
+      return { kind: 2 /* Function */, token, call: parent2.parent, sourceFile: moduleDeclarationSourceFile, modifierFlags: 32 /* Export */, parentDeclaration: moduleDeclaration };
     }
     const moduleSourceFile = find(symbol.declarations, isSourceFile);
     if (sourceFile.commonJsModuleIndicator) return void 0;
@@ -183069,7 +183070,7 @@ var Project2 = class _Project {
   }
   fileExists(file) {
     const path = this.toPath(file);
-    return !this.isWatchedMissingFile(path) && this.directoryStructureHost.fileExists(file);
+    return !!this.projectService.getScriptInfoForPath(path) || !this.isWatchedMissingFile(path) && this.directoryStructureHost.fileExists(file);
   }
   /** @internal */
   resolveModuleNameLiterals(moduleLiterals, containingFile, redirectedReference, options, containingSourceFile, reusedNames) {
@@ -186093,59 +186094,13 @@ var _ProjectService = class _ProjectService {
   watchWildcardDirectory(directory, flags, configFileName, config) {
     let watcher = this.watchFactory.watchDirectory(
       directory,
-      (fileOrDirectory) => {
-        const fileOrDirectoryPath = this.toPath(fileOrDirectory);
-        const fsResult = config.cachedDirectoryStructureHost.addOrDeleteFileOrDirectory(fileOrDirectory, fileOrDirectoryPath);
-        if (getBaseFileName(fileOrDirectoryPath) === "package.json" && !isInsideNodeModules(fileOrDirectoryPath) && (fsResult && fsResult.fileExists || !fsResult && this.host.fileExists(fileOrDirectory))) {
-          const file = this.getNormalizedAbsolutePath(fileOrDirectory);
-          this.logger.info(`Config: ${configFileName} Detected new package.json: ${file}`);
-          this.packageJsonCache.addOrUpdate(file, fileOrDirectoryPath);
-          this.watchPackageJsonFile(file, fileOrDirectoryPath, result);
-        }
-        const configuredProjectForConfig = this.findConfiguredProjectByProjectName(configFileName);
-        if (isIgnoredFileFromWildCardWatching({
-          watchedDirPath: this.toPath(directory),
-          fileOrDirectory,
-          fileOrDirectoryPath,
-          configFileName,
-          extraFileExtensions: this.hostConfiguration.extraFileExtensions,
-          currentDirectory: this.currentDirectory,
-          options: config.parsedCommandLine.options,
-          program: (configuredProjectForConfig == null ? void 0 : configuredProjectForConfig.getCurrentProgram()) || config.parsedCommandLine.fileNames,
-          useCaseSensitiveFileNames: this.host.useCaseSensitiveFileNames,
-          writeLog: (s) => this.logger.info(s),
-          toPath: (s) => this.toPath(s),
-          getScriptKind: configuredProjectForConfig ? (fileName) => configuredProjectForConfig.getScriptKind(fileName) : void 0
-        })) return;
-        if (config.updateLevel !== 2 /* Full */) config.updateLevel = 1 /* RootNamesAndUpdate */;
-        config.projects.forEach((watchWildcardDirectories, projectCanonicalPath) => {
-          var _a;
-          if (!watchWildcardDirectories) return;
-          const project = this.getConfiguredProjectByCanonicalConfigFilePath(projectCanonicalPath);
-          if (!project) return;
-          if (configuredProjectForConfig !== project && this.getHostPreferences().includeCompletionsForModuleExports) {
-            const path = this.toPath(configFileName);
-            if (find((_a = project.getCurrentProgram()) == null ? void 0 : _a.getResolvedProjectReferences(), (ref) => (ref == null ? void 0 : ref.sourceFile.path) === path)) {
-              project.markAutoImportProviderAsDirty();
-            }
-          }
-          const updateLevel = configuredProjectForConfig === project ? 1 /* RootNamesAndUpdate */ : 0 /* Update */;
-          if (project.pendingUpdateLevel > updateLevel) return;
-          if (this.openFiles.has(fileOrDirectoryPath)) {
-            const info = Debug.checkDefined(this.getScriptInfoForPath(fileOrDirectoryPath));
-            if (info.isAttached(project)) {
-              const loadLevelToSet = Math.max(updateLevel, project.openFileWatchTriggered.get(fileOrDirectoryPath) || 0 /* Update */);
-              project.openFileWatchTriggered.set(fileOrDirectoryPath, loadLevelToSet);
-            } else {
-              project.pendingUpdateLevel = updateLevel;
-              this.delayUpdateProjectGraphAndEnsureProjectStructureForOpenFiles(project);
-            }
-          } else {
-            project.pendingUpdateLevel = updateLevel;
-            this.delayUpdateProjectGraphAndEnsureProjectStructureForOpenFiles(project);
-          }
-        });
-      },
+      (fileOrDirectory) => this.onWildCardDirectoryWatcherInvoke(
+        directory,
+        configFileName,
+        config,
+        result,
+        fileOrDirectory
+      ),
       flags,
       this.getWatchOptionsFromProjectWatchOptions(config.parsedCommandLine.watchOptions, getDirectoryPath(configFileName)),
       WatchType.WildcardDirectory,
@@ -186168,6 +186123,59 @@ var _ProjectService = class _ProjectService {
     };
     return result;
   }
+  onWildCardDirectoryWatcherInvoke(directory, configFileName, config, wildCardWatcher, fileOrDirectory) {
+    const fileOrDirectoryPath = this.toPath(fileOrDirectory);
+    const fsResult = config.cachedDirectoryStructureHost.addOrDeleteFileOrDirectory(fileOrDirectory, fileOrDirectoryPath);
+    if (getBaseFileName(fileOrDirectoryPath) === "package.json" && !isInsideNodeModules(fileOrDirectoryPath) && (fsResult && fsResult.fileExists || !fsResult && this.host.fileExists(fileOrDirectory))) {
+      const file = this.getNormalizedAbsolutePath(fileOrDirectory);
+      this.logger.info(`Config: ${configFileName} Detected new package.json: ${file}`);
+      this.packageJsonCache.addOrUpdate(file, fileOrDirectoryPath);
+      this.watchPackageJsonFile(file, fileOrDirectoryPath, wildCardWatcher);
+    }
+    const configuredProjectForConfig = this.findConfiguredProjectByProjectName(configFileName);
+    if (isIgnoredFileFromWildCardWatching({
+      watchedDirPath: this.toPath(directory),
+      fileOrDirectory,
+      fileOrDirectoryPath,
+      configFileName,
+      extraFileExtensions: this.hostConfiguration.extraFileExtensions,
+      currentDirectory: this.currentDirectory,
+      options: config.parsedCommandLine.options,
+      program: (configuredProjectForConfig == null ? void 0 : configuredProjectForConfig.getCurrentProgram()) || config.parsedCommandLine.fileNames,
+      useCaseSensitiveFileNames: this.host.useCaseSensitiveFileNames,
+      writeLog: (s) => this.logger.info(s),
+      toPath: (s) => this.toPath(s),
+      getScriptKind: configuredProjectForConfig ? (fileName) => configuredProjectForConfig.getScriptKind(fileName) : void 0
+    })) return;
+    if (config.updateLevel !== 2 /* Full */) config.updateLevel = 1 /* RootNamesAndUpdate */;
+    config.projects.forEach((watchWildcardDirectories, projectCanonicalPath) => {
+      var _a;
+      if (!watchWildcardDirectories) return;
+      const project = this.getConfiguredProjectByCanonicalConfigFilePath(projectCanonicalPath);
+      if (!project) return;
+      if (configuredProjectForConfig !== project && this.getHostPreferences().includeCompletionsForModuleExports) {
+        const path = this.toPath(configFileName);
+        if (find((_a = project.getCurrentProgram()) == null ? void 0 : _a.getResolvedProjectReferences(), (ref) => (ref == null ? void 0 : ref.sourceFile.path) === path)) {
+          project.markAutoImportProviderAsDirty();
+        }
+      }
+      const updateLevel = configuredProjectForConfig === project ? 1 /* RootNamesAndUpdate */ : 0 /* Update */;
+      if (project.pendingUpdateLevel > updateLevel) return;
+      if (this.openFiles.has(fileOrDirectoryPath)) {
+        const info = Debug.checkDefined(this.getScriptInfoForPath(fileOrDirectoryPath));
+        if (info.isAttached(project)) {
+          const loadLevelToSet = Math.max(updateLevel, project.openFileWatchTriggered.get(fileOrDirectoryPath) || 0 /* Update */);
+          project.openFileWatchTriggered.set(fileOrDirectoryPath, loadLevelToSet);
+        } else {
+          project.pendingUpdateLevel = updateLevel;
+          this.delayUpdateProjectGraphAndEnsureProjectStructureForOpenFiles(project);
+        }
+      } else {
+        project.pendingUpdateLevel = updateLevel;
+        this.delayUpdateProjectGraphAndEnsureProjectStructureForOpenFiles(project);
+      }
+    });
+  }
   delayUpdateProjectsFromParsedConfigOnConfigFileChange(canonicalConfigFilePath, loadReason) {
     const configFileExistenceInfo = this.configFileExistenceInfoCache.get(canonicalConfigFilePath);
     if (!(configFileExistenceInfo == null ? void 0 : configFileExistenceInfo.config)) return false;
@@ -188084,8 +188092,38 @@ Dynamic files must always be opened with service's current directory or service
     }
     this.removeOrphanScriptInfos();
   }
+  tryInvokeWildCardDirectories(info) {
+    this.configFileExistenceInfoCache.forEach((configFileExistenceInfo, config) => {
+      var _a, _b;
+      if (!((_a = configFileExistenceInfo.config) == null ? void 0 : _a.parsedCommandLine) || contains(
+        configFileExistenceInfo.config.parsedCommandLine.fileNames,
+        info.fileName,
+        !this.host.useCaseSensitiveFileNames ? equateStringsCaseInsensitive : equateStringsCaseSensitive
+      )) {
+        return;
+      }
+      (_b = configFileExistenceInfo.config.watchedDirectories) == null ? void 0 : _b.forEach((watcher, directory) => {
+        if (containsPath(directory, info.fileName, !this.host.useCaseSensitiveFileNames)) {
+          this.logger.info(`Invoking ${config}:: wildcard for open scriptInfo:: ${info.fileName}`);
+          this.onWildCardDirectoryWatcherInvoke(
+            directory,
+            config,
+            configFileExistenceInfo.config,
+            watcher.watcher,
+            info.fileName
+          );
+        }
+      });
+    });
+  }
   openClientFileWithNormalizedPath(fileName, fileContent, scriptKind, hasMixedContent, projectRootPath) {
+    const existing = this.getScriptInfoForPath(normalizedPathToPath(
+      fileName,
+      projectRootPath ? this.getNormalizedAbsolutePath(projectRootPath) : this.currentDirectory,
+      this.toCanonicalFileName
+    ));
     const info = this.getOrCreateOpenScriptInfo(fileName, fileContent, scriptKind, hasMixedContent, projectRootPath);
+    if (!existing && info && !info.isDynamic) this.tryInvokeWildCardDirectories(info);
     const { retainProjects, ...result } = this.assignProjectToOpenedScriptInfo(info);
     this.cleanupProjectsAndScriptInfos(
       retainProjects,
@@ -188232,10 +188270,16 @@ Dynamic files must always be opened with service's current directory or service
   }
   /** @internal */
   applyChangesInOpenFiles(openFiles, changedFiles, closedFiles) {
+    let existingOpenScriptInfos;
     let openScriptInfos;
     let assignOrphanScriptInfosToInferredProject = false;
     if (openFiles) {
       for (const file of openFiles) {
+        (existingOpenScriptInfos ?? (existingOpenScriptInfos = [])).push(this.getScriptInfoForPath(normalizedPathToPath(
+          toNormalizedPath(file.fileName),
+          file.projectRootPath ? this.getNormalizedAbsolutePath(file.projectRootPath) : this.currentDirectory,
+          this.toCanonicalFileName
+        )));
         const info = this.getOrCreateOpenScriptInfo(
           toNormalizedPath(file.fileName),
           file.content,
@@ -188263,6 +188307,10 @@ Dynamic files must always be opened with service's current directory or service
       }
     }
     let retainProjects;
+    forEach(
+      existingOpenScriptInfos,
+      (existing, index) => !existing && openScriptInfos[index] && !openScriptInfos[index].isDynamic ? this.tryInvokeWildCardDirectories(openScriptInfos[index]) : void 0
+    );
     openScriptInfos == null ? void 0 : openScriptInfos.forEach((info) => {
       var _a;
       return (_a = this.assignProjectToOpenedScriptInfo(info).retainProjects) == null ? void 0 : _a.forEach((p) => (retainProjects ?? (retainProjects = /* @__PURE__ */ new Set())).add(p));
@@ -191367,42 +191415,12 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
     const prefix = args.prefix || "";
     const entries = mapDefined(completions.entries, (entry) => {
       if (completions.isMemberCompletion || startsWith(entry.name.toLowerCase(), prefix.toLowerCase())) {
-        const {
-          name,
-          kind: kind2,
-          kindModifiers,
-          sortText,
-          insertText,
-          filterText,
-          replacementSpan,
-          hasAction,
-          source,
-          sourceDisplay,
-          labelDetails,
-          isSnippet,
-          isRecommended,
-          isPackageJsonImport,
-          isImportStatementCompletion,
-          data
-        } = entry;
-        const convertedSpan = replacementSpan ? toProtocolTextSpan(replacementSpan, scriptInfo) : void 0;
+        const convertedSpan = entry.replacementSpan ? toProtocolTextSpan(entry.replacementSpan, scriptInfo) : void 0;
         return {
-          name,
-          kind: kind2,
-          kindModifiers,
-          sortText,
-          insertText,
-          filterText,
+          ...entry,
           replacementSpan: convertedSpan,
-          isSnippet,
-          hasAction: hasAction || void 0,
-          source,
-          sourceDisplay,
-          labelDetails,
-          isRecommended,
-          isPackageJsonImport,
-          isImportStatementCompletion,
-          data
+          hasAction: entry.hasAction || void 0,
+          symbol: void 0
         };
       }
     });

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.6.0-dev.20240724",
+    "version": "5.6.0-dev.20240726",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -114,5 +114,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "3f6f3164d6b8226953490bb43fd1ae5a7aa99fa4"
+    "gitHead": "12ae799eda74aca6a4051f1ebee4d2d0c8d817a2"
 }