typescript 5.3.0-dev.20230907 → 5.3.0-dev.20230909

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.3";
-var version = `${versionMajorMinor}.0-dev.20230907`;
+var version = `${versionMajorMinor}.0-dev.20230909`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -14990,7 +14990,31 @@ function getSourceFilesToEmit(host, targetSourceFile, forceDtsEmit) {
 }
 function sourceFileMayBeEmitted(sourceFile, host, forceDtsEmit) {
   const options = host.getCompilerOptions();
-  return !(options.noEmitForJsFiles && isSourceFileJS(sourceFile)) && !sourceFile.isDeclarationFile && !host.isSourceFileFromExternalLibrary(sourceFile) && (forceDtsEmit || !(isJsonSourceFile(sourceFile) && host.getResolvedProjectReferenceToRedirect(sourceFile.fileName)) && !host.isSourceOfProjectReferenceRedirect(sourceFile.fileName));
+  if (options.noEmitForJsFiles && isSourceFileJS(sourceFile))
+    return false;
+  if (sourceFile.isDeclarationFile)
+    return false;
+  if (host.isSourceFileFromExternalLibrary(sourceFile))
+    return false;
+  if (forceDtsEmit)
+    return true;
+  if (host.isSourceOfProjectReferenceRedirect(sourceFile.fileName))
+    return false;
+  if (!isJsonSourceFile(sourceFile))
+    return true;
+  if (host.getResolvedProjectReferenceToRedirect(sourceFile.fileName))
+    return false;
+  if (outFile(options))
+    return true;
+  if (!options.outDir)
+    return false;
+  if (options.rootDir || options.composite && options.configFilePath) {
+    const commonDir = getNormalizedAbsolutePath(getCommonSourceDirectory(options, () => [], host.getCurrentDirectory(), host.getCanonicalFileName), host.getCurrentDirectory());
+    const outputPath = getSourceFilePathInNewDirWorker(sourceFile.fileName, options.outDir, host.getCurrentDirectory(), commonDir, host.getCanonicalFileName);
+    if (comparePaths(sourceFile.fileName, outputPath, host.getCurrentDirectory(), !host.useCaseSensitiveFileNames()) === 0 /* EqualTo */)
+      return false;
+  }
+  return true;
 }
 function getSourceFilePathInNewDir(fileName, host, newDirPath) {
   return getSourceFilePathInNewDirWorker(fileName, newDirPath, host.getCurrentDirectory(), host.getCommonSourceDirectory(), (f) => host.getCanonicalFileName(f));

package/lib/tsserver.js

@@ -2327,7 +2327,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.3";
-var version = `${versionMajorMinor}.0-dev.20230907`;
+var version = `${versionMajorMinor}.0-dev.20230909`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -18957,7 +18957,31 @@ function getSourceFilesToEmit(host, targetSourceFile, forceDtsEmit) {
 }
 function sourceFileMayBeEmitted(sourceFile, host, forceDtsEmit) {
   const options = host.getCompilerOptions();
-  return !(options.noEmitForJsFiles && isSourceFileJS(sourceFile)) && !sourceFile.isDeclarationFile && !host.isSourceFileFromExternalLibrary(sourceFile) && (forceDtsEmit || !(isJsonSourceFile(sourceFile) && host.getResolvedProjectReferenceToRedirect(sourceFile.fileName)) && !host.isSourceOfProjectReferenceRedirect(sourceFile.fileName));
+  if (options.noEmitForJsFiles && isSourceFileJS(sourceFile))
+    return false;
+  if (sourceFile.isDeclarationFile)
+    return false;
+  if (host.isSourceFileFromExternalLibrary(sourceFile))
+    return false;
+  if (forceDtsEmit)
+    return true;
+  if (host.isSourceOfProjectReferenceRedirect(sourceFile.fileName))
+    return false;
+  if (!isJsonSourceFile(sourceFile))
+    return true;
+  if (host.getResolvedProjectReferenceToRedirect(sourceFile.fileName))
+    return false;
+  if (outFile(options))
+    return true;
+  if (!options.outDir)
+    return false;
+  if (options.rootDir || options.composite && options.configFilePath) {
+    const commonDir = getNormalizedAbsolutePath(getCommonSourceDirectory(options, () => [], host.getCurrentDirectory(), host.getCanonicalFileName), host.getCurrentDirectory());
+    const outputPath = getSourceFilePathInNewDirWorker(sourceFile.fileName, options.outDir, host.getCurrentDirectory(), commonDir, host.getCanonicalFileName);
+    if (comparePaths(sourceFile.fileName, outputPath, host.getCurrentDirectory(), !host.useCaseSensitiveFileNames()) === 0 /* EqualTo */)
+      return false;
+  }
+  return true;
 }
 function getSourceFilePathInNewDir(fileName, host, newDirPath) {
   return getSourceFilePathInNewDirWorker(fileName, newDirPath, host.getCurrentDirectory(), host.getCommonSourceDirectory(), (f) => host.getCanonicalFileName(f));
@@ -136428,30 +136452,37 @@ __export(ts_NavigateTo_exports, {
 });
 
 // src/services/navigateTo.ts
-function getNavigateToItems(sourceFiles, checker, cancellationToken, searchValue, maxResultCount, excludeDtsFiles) {
+function getNavigateToItems(sourceFiles, checker, cancellationToken, searchValue, maxResultCount, excludeDtsFiles, excludeLibFiles) {
   const patternMatcher = createPatternMatcher(searchValue);
   if (!patternMatcher)
     return emptyArray;
   const rawItems = [];
+  const singleCurrentFile = sourceFiles.length === 1 ? sourceFiles[0] : void 0;
   for (const sourceFile of sourceFiles) {
     cancellationToken.throwIfCancellationRequested();
     if (excludeDtsFiles && sourceFile.isDeclarationFile) {
       continue;
     }
+    if (shouldExcludeFile(sourceFile, !!excludeLibFiles, singleCurrentFile)) {
+      continue;
+    }
     sourceFile.getNamedDeclarations().forEach((declarations, name) => {
-      getItemsFromNamedDeclaration(patternMatcher, name, declarations, checker, sourceFile.fileName, rawItems);
+      getItemsFromNamedDeclaration(patternMatcher, name, declarations, checker, sourceFile.fileName, !!excludeLibFiles, singleCurrentFile, rawItems);
     });
   }
   rawItems.sort(compareNavigateToItems);
   return (maxResultCount === void 0 ? rawItems : rawItems.slice(0, maxResultCount)).map(createNavigateToItem);
 }
-function getItemsFromNamedDeclaration(patternMatcher, name, declarations, checker, fileName, rawItems) {
+function shouldExcludeFile(file, excludeLibFiles, singleCurrentFile) {
+  return file !== singleCurrentFile && excludeLibFiles && (isInsideNodeModules(file.path) || file.hasNoDefaultLib);
+}
+function getItemsFromNamedDeclaration(patternMatcher, name, declarations, checker, fileName, excludeLibFiles, singleCurrentFile, rawItems) {
   const match = patternMatcher.getMatchForLastSegmentOfPattern(name);
   if (!match) {
     return;
   }
   for (const declaration of declarations) {
-    if (!shouldKeepItem(declaration, checker))
+    if (!shouldKeepItem(declaration, checker, excludeLibFiles, singleCurrentFile))
       continue;
     if (patternMatcher.patternContainsDots) {
       const fullMatch = patternMatcher.getFullMatch(getContainers(declaration), name);
@@ -136463,14 +136494,15 @@ function getItemsFromNamedDeclaration(patternMatcher, name, declarations, checke
     }
   }
 }
-function shouldKeepItem(declaration, checker) {
+function shouldKeepItem(declaration, checker, excludeLibFiles, singleCurrentFile) {
+  var _a;
   switch (declaration.kind) {
     case 273 /* ImportClause */:
     case 276 /* ImportSpecifier */:
     case 271 /* ImportEqualsDeclaration */:
       const importer = checker.getSymbolAtLocation(declaration.name);
       const imported = checker.getAliasedSymbol(importer);
-      return importer.escapedName !== imported.escapedName;
+      return importer.escapedName !== imported.escapedName && !((_a = imported.declarations) == null ? void 0 : _a.every((d) => shouldExcludeFile(d.getSourceFile(), excludeLibFiles, singleCurrentFile)));
     default:
       return true;
   }
@@ -144162,10 +144194,10 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
     synchronizeHostData();
     return ts_FindAllReferences_exports.Core.getReferencesForFileName(fileName, program, program.getSourceFiles()).map(ts_FindAllReferences_exports.toReferenceEntry);
   }
-  function getNavigateToItems2(searchValue, maxResultCount, fileName, excludeDtsFiles = false) {
+  function getNavigateToItems2(searchValue, maxResultCount, fileName, excludeDtsFiles = false, excludeLibFiles = false) {
     synchronizeHostData();
     const sourceFiles = fileName ? [getValidSourceFile(fileName)] : program.getSourceFiles();
-    return getNavigateToItems(sourceFiles, program.getTypeChecker(), cancellationToken, searchValue, maxResultCount, excludeDtsFiles);
+    return getNavigateToItems(sourceFiles, program.getTypeChecker(), cancellationToken, searchValue, maxResultCount, excludeDtsFiles, excludeLibFiles);
   }
   function getEmitOutput(fileName, emitOnlyDtsFiles, forceDtsEmit) {
     synchronizeHostData();
@@ -184281,6 +184313,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
       const { file, project } = this.getFileAndProject(args);
       return [{ project, navigateToItems: project.getLanguageService().getNavigateToItems(searchValue, maxResultCount, file) }];
     }
+    const preferences = this.getHostPreferences();
     const outputs = [];
     const seenItems = /* @__PURE__ */ new Map();
     if (!args.file && !projectFileName) {
@@ -184303,7 +184336,9 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
         /*fileName*/
         void 0,
         /*excludeDts*/
-        project.isNonTsProject()
+        project.isNonTsProject(),
+        /*excludeLibFiles*/
+        preferences.excludeLibrarySymbolsInNavTo
       );
       const unseenItems = filter(projectItems, (item) => tryAddSeenItem(item) && !getMappedLocationForProject(documentSpanLocation(item), project));
       if (unseenItems.length) {

package/lib/typescript.d.ts

@@ -2897,6 +2897,10 @@ declare namespace ts {
                  * Indicates whether {@link ReferencesResponseItem.lineText} is supported.
                  */
                 readonly disableLineTextInReferences?: boolean;
+                /**
+                 * Indicates whether to exclude standard library and node_modules file symbols from navTo results.
+                 */
+                readonly excludeLibrarySymbolsInNavTo?: boolean;
             }
             interface CompilerOptions {
                 allowJs?: boolean;
@@ -8640,6 +8644,7 @@ declare namespace ts {
         readonly organizeImportsNumericCollation?: boolean;
         readonly organizeImportsAccentCollation?: boolean;
         readonly organizeImportsCaseFirst?: "upper" | "lower" | false;
+        readonly excludeLibrarySymbolsInNavTo?: boolean;
     }
     /** Represents a bigint literal value without requiring bigint support */
     interface PseudoBigInt {
@@ -10396,7 +10401,7 @@ declare namespace ts {
         findReferences(fileName: string, position: number): ReferencedSymbol[] | undefined;
         getDocumentHighlights(fileName: string, position: number, filesToSearch: string[]): DocumentHighlights[] | undefined;
         getFileReferences(fileName: string): ReferenceEntry[];
-        getNavigateToItems(searchValue: string, maxResultCount?: number, fileName?: string, excludeDtsFiles?: boolean): NavigateToItem[];
+        getNavigateToItems(searchValue: string, maxResultCount?: number, fileName?: string, excludeDtsFiles?: boolean, excludeLibFiles?: boolean): NavigateToItem[];
         getNavigationBarItems(fileName: string): NavigationBarItem[];
         getNavigationTree(fileName: string): NavigationTree;
         prepareCallHierarchy(fileName: string, position: number): CallHierarchyItem | CallHierarchyItem[] | undefined;

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.3";
-      version = `${versionMajorMinor}.0-dev.20230907`;
+      version = `${versionMajorMinor}.0-dev.20230909`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -16262,7 +16262,31 @@ ${lanes.join("\n")}
   }
   function sourceFileMayBeEmitted(sourceFile, host, forceDtsEmit) {
     const options = host.getCompilerOptions();
-    return !(options.noEmitForJsFiles && isSourceFileJS(sourceFile)) && !sourceFile.isDeclarationFile && !host.isSourceFileFromExternalLibrary(sourceFile) && (forceDtsEmit || !(isJsonSourceFile(sourceFile) && host.getResolvedProjectReferenceToRedirect(sourceFile.fileName)) && !host.isSourceOfProjectReferenceRedirect(sourceFile.fileName));
+    if (options.noEmitForJsFiles && isSourceFileJS(sourceFile))
+      return false;
+    if (sourceFile.isDeclarationFile)
+      return false;
+    if (host.isSourceFileFromExternalLibrary(sourceFile))
+      return false;
+    if (forceDtsEmit)
+      return true;
+    if (host.isSourceOfProjectReferenceRedirect(sourceFile.fileName))
+      return false;
+    if (!isJsonSourceFile(sourceFile))
+      return true;
+    if (host.getResolvedProjectReferenceToRedirect(sourceFile.fileName))
+      return false;
+    if (outFile(options))
+      return true;
+    if (!options.outDir)
+      return false;
+    if (options.rootDir || options.composite && options.configFilePath) {
+      const commonDir = getNormalizedAbsolutePath(getCommonSourceDirectory(options, () => [], host.getCurrentDirectory(), host.getCanonicalFileName), host.getCurrentDirectory());
+      const outputPath = getSourceFilePathInNewDirWorker(sourceFile.fileName, options.outDir, host.getCurrentDirectory(), commonDir, host.getCanonicalFileName);
+      if (comparePaths(sourceFile.fileName, outputPath, host.getCurrentDirectory(), !host.useCaseSensitiveFileNames()) === 0 /* EqualTo */)
+        return false;
+    }
+    return true;
   }
   function getSourceFilePathInNewDir(fileName, host, newDirPath) {
     return getSourceFilePathInNewDirWorker(fileName, newDirPath, host.getCurrentDirectory(), host.getCommonSourceDirectory(), (f) => host.getCanonicalFileName(f));
@@ -134802,30 +134826,37 @@ ${lanes.join("\n")}
   });
 
   // src/services/navigateTo.ts
-  function getNavigateToItems(sourceFiles, checker, cancellationToken, searchValue, maxResultCount, excludeDtsFiles) {
+  function getNavigateToItems(sourceFiles, checker, cancellationToken, searchValue, maxResultCount, excludeDtsFiles, excludeLibFiles) {
     const patternMatcher = createPatternMatcher(searchValue);
     if (!patternMatcher)
       return emptyArray;
     const rawItems = [];
+    const singleCurrentFile = sourceFiles.length === 1 ? sourceFiles[0] : void 0;
     for (const sourceFile of sourceFiles) {
       cancellationToken.throwIfCancellationRequested();
       if (excludeDtsFiles && sourceFile.isDeclarationFile) {
         continue;
       }
+      if (shouldExcludeFile(sourceFile, !!excludeLibFiles, singleCurrentFile)) {
+        continue;
+      }
       sourceFile.getNamedDeclarations().forEach((declarations, name) => {
-        getItemsFromNamedDeclaration(patternMatcher, name, declarations, checker, sourceFile.fileName, rawItems);
+        getItemsFromNamedDeclaration(patternMatcher, name, declarations, checker, sourceFile.fileName, !!excludeLibFiles, singleCurrentFile, rawItems);
       });
     }
     rawItems.sort(compareNavigateToItems);
     return (maxResultCount === void 0 ? rawItems : rawItems.slice(0, maxResultCount)).map(createNavigateToItem);
   }
-  function getItemsFromNamedDeclaration(patternMatcher, name, declarations, checker, fileName, rawItems) {
+  function shouldExcludeFile(file, excludeLibFiles, singleCurrentFile) {
+    return file !== singleCurrentFile && excludeLibFiles && (isInsideNodeModules(file.path) || file.hasNoDefaultLib);
+  }
+  function getItemsFromNamedDeclaration(patternMatcher, name, declarations, checker, fileName, excludeLibFiles, singleCurrentFile, rawItems) {
     const match = patternMatcher.getMatchForLastSegmentOfPattern(name);
     if (!match) {
       return;
     }
     for (const declaration of declarations) {
-      if (!shouldKeepItem(declaration, checker))
+      if (!shouldKeepItem(declaration, checker, excludeLibFiles, singleCurrentFile))
         continue;
       if (patternMatcher.patternContainsDots) {
         const fullMatch = patternMatcher.getFullMatch(getContainers(declaration), name);
@@ -134837,14 +134868,15 @@ ${lanes.join("\n")}
       }
     }
   }
-  function shouldKeepItem(declaration, checker) {
+  function shouldKeepItem(declaration, checker, excludeLibFiles, singleCurrentFile) {
+    var _a;
     switch (declaration.kind) {
       case 273 /* ImportClause */:
       case 276 /* ImportSpecifier */:
       case 271 /* ImportEqualsDeclaration */:
         const importer = checker.getSymbolAtLocation(declaration.name);
         const imported = checker.getAliasedSymbol(importer);
-        return importer.escapedName !== imported.escapedName;
+        return importer.escapedName !== imported.escapedName && !((_a = imported.declarations) == null ? void 0 : _a.every((d) => shouldExcludeFile(d.getSourceFile(), excludeLibFiles, singleCurrentFile)));
       default:
         return true;
     }
@@ -142107,10 +142139,10 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       synchronizeHostData();
       return ts_FindAllReferences_exports.Core.getReferencesForFileName(fileName, program, program.getSourceFiles()).map(ts_FindAllReferences_exports.toReferenceEntry);
     }
-    function getNavigateToItems2(searchValue, maxResultCount, fileName, excludeDtsFiles = false) {
+    function getNavigateToItems2(searchValue, maxResultCount, fileName, excludeDtsFiles = false, excludeLibFiles = false) {
       synchronizeHostData();
       const sourceFiles = fileName ? [getValidSourceFile(fileName)] : program.getSourceFiles();
-      return getNavigateToItems(sourceFiles, program.getTypeChecker(), cancellationToken, searchValue, maxResultCount, excludeDtsFiles);
+      return getNavigateToItems(sourceFiles, program.getTypeChecker(), cancellationToken, searchValue, maxResultCount, excludeDtsFiles, excludeLibFiles);
     }
     function getEmitOutput(fileName, emitOnlyDtsFiles, forceDtsEmit) {
       synchronizeHostData();
@@ -181696,6 +181728,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
             const { file, project } = this.getFileAndProject(args);
             return [{ project, navigateToItems: project.getLanguageService().getNavigateToItems(searchValue, maxResultCount, file) }];
           }
+          const preferences = this.getHostPreferences();
           const outputs = [];
           const seenItems = /* @__PURE__ */ new Map();
           if (!args.file && !projectFileName) {
@@ -181718,7 +181751,9 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
               /*fileName*/
               void 0,
               /*excludeDts*/
-              project.isNonTsProject()
+              project.isNonTsProject(),
+              /*excludeLibFiles*/
+              preferences.excludeLibrarySymbolsInNavTo
             );
             const unseenItems = filter(projectItems, (item) => tryAddSeenItem(item) && !getMappedLocationForProject(documentSpanLocation(item), project));
             if (unseenItems.length) {

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.3";
-var version = `${versionMajorMinor}.0-dev.20230907`;
+var version = `${versionMajorMinor}.0-dev.20230909`;
 
 // src/compiler/core.ts
 var emptyArray = [];

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.3.0-dev.20230907",
+    "version": "5.3.0-dev.20230909",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -112,5 +112,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "6cc605fcfe66118eafb50b2fdbd386da7e419795"
+    "gitHead": "fdb2531c0b188937c057786c276f7b12e89ab48e"
 }