Skip to content

Commit a9aa65f

Browse files
committed
Pickup PackageJsonInfo renames from #50088
1 parent 7e272d6 commit a9aa65f

File tree

8 files changed

+18
-19
lines changed

8 files changed

+18
-19
lines changed

src/compiler/moduleNameResolver.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1802,7 +1802,7 @@ namespace ts {
18021802
}
18031803

18041804
/*@internal*/
1805-
interface PackageJsonInfo {
1805+
export interface PackageJsonInfo {
18061806
packageDirectory: string;
18071807
packageJsonContent: PackageJsonPathFields;
18081808
versionPaths: VersionPaths | undefined;

src/compiler/parser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,7 @@ namespace ts {
747747
*/
748748
setExternalModuleIndicator?: (file: SourceFile) => void;
749749
/*@internal*/ packageJsonLocations?: readonly string[];
750-
/*@internal*/ packageJsonScope?: ReturnType<typeof getPackageScopeForPath>;
750+
/*@internal*/ packageJsonScope?: PackageJsonInfo;
751751
}
752752

753753
function setExternalModuleIndicator(sourceFile: SourceFile) {

src/compiler/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3800,7 +3800,7 @@ namespace ts {
38003800
*/
38013801
impliedNodeFormat?: ModuleKind.ESNext | ModuleKind.CommonJS;
38023802
/*@internal*/ packageJsonLocations?: readonly string[];
3803-
/*@internal*/ packageJsonScope?: ReturnType<typeof getPackageScopeForPath>;
3803+
/*@internal*/ packageJsonScope?: PackageJsonInfo;
38043804

38053805
/* @internal */ scriptKind: ScriptKind;
38063806

src/server/editorServices.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4185,11 +4185,11 @@ namespace ts.server {
41854185
}
41864186

41874187
/*@internal*/
4188-
getPackageJsonsVisibleToFile(fileName: string, rootDir?: string): readonly PackageJsonInfo[] {
4188+
getPackageJsonsVisibleToFile(fileName: string, rootDir?: string): readonly ProjectPackageJsonInfo[] {
41894189
const packageJsonCache = this.packageJsonCache;
41904190
const rootPath = rootDir && this.toPath(rootDir);
41914191
const filePath = this.toPath(fileName);
4192-
const result: PackageJsonInfo[] = [];
4192+
const result: ProjectPackageJsonInfo[] = [];
41934193
const processDirectory = (directory: Path): boolean | undefined => {
41944194
switch (packageJsonCache.directoryHasPackageJson(directory)) {
41954195
// Sync and check same directory again

src/server/packageJsonCache.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
namespace ts.server {
33
export interface PackageJsonCache {
44
addOrUpdate(fileName: Path): void;
5-
forEach(action: (info: PackageJsonInfo, fileName: Path) => void): void;
5+
forEach(action: (info: ProjectPackageJsonInfo, fileName: Path) => void): void;
66
delete(fileName: Path): void;
7-
get(fileName: Path): PackageJsonInfo | false | undefined;
8-
getInDirectory(directory: Path): PackageJsonInfo | undefined;
7+
get(fileName: Path): ProjectPackageJsonInfo | false | undefined;
8+
getInDirectory(directory: Path): ProjectPackageJsonInfo | undefined;
99
directoryHasPackageJson(directory: Path): Ternary;
1010
searchDirectoryAndAncestors(directory: Path): void;
1111
}
1212

1313
export function createPackageJsonCache(host: ProjectService): PackageJsonCache {
14-
const packageJsons = new Map<string, PackageJsonInfo>();
14+
const packageJsons = new Map<string, ProjectPackageJsonInfo>();
1515
const directoriesWithoutPackageJson = new Map<string, true>();
1616
return {
1717
addOrUpdate,

src/server/project.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1751,7 +1751,7 @@ namespace ts.server {
17511751
}
17521752

17531753
/*@internal*/
1754-
getPackageJsonsVisibleToFile(fileName: string, rootDir?: string): readonly PackageJsonInfo[] {
1754+
getPackageJsonsVisibleToFile(fileName: string, rootDir?: string): readonly ProjectPackageJsonInfo[] {
17551755
if (this.projectService.serverMode !== LanguageServiceMode.Semantic) return emptyArray;
17561756
return this.projectService.getPackageJsonsVisibleToFile(fileName, rootDir);
17571757
}
@@ -1762,7 +1762,7 @@ namespace ts.server {
17621762
}
17631763

17641764
/*@internal*/
1765-
getPackageJsonsForAutoImport(rootDir?: string): readonly PackageJsonInfo[] {
1765+
getPackageJsonsForAutoImport(rootDir?: string): readonly ProjectPackageJsonInfo[] {
17661766
const packageJsons = this.getPackageJsonsVisibleToFile(combinePaths(this.currentDirectory, inferredTypesContainingFile), rootDir);
17671767
this.packageJsonsForAutoImport = new Set(packageJsons.map(p => p.fileName));
17681768
return packageJsons;
@@ -2177,7 +2177,6 @@ namespace ts.server {
21772177
}
21782178
}
21792179

2180-
type PackageJsonInfo = NonNullable<ReturnType<typeof resolvePackageNameToPackageJson>>;
21812180
function getRootNamesFromPackageJson(packageJson: PackageJsonInfo, program: Program, symlinkCache: SymlinkCache, resolveJs?: boolean) {
21822181
const entrypoints = getEntrypointsFromPackageJsonInfo(
21832182
packageJson,

src/services/types.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ namespace ts {
197197
}
198198

199199
/* @internal */
200-
export interface PackageJsonInfo {
200+
export interface ProjectPackageJsonInfo {
201201
fileName: string;
202202
parseable: boolean;
203203
dependencies?: ESMap<string, string>;
@@ -311,9 +311,9 @@ namespace ts {
311311

312312
/* @internal */ getDocumentPositionMapper?(generatedFileName: string, sourceFileName?: string): DocumentPositionMapper | undefined;
313313
/* @internal */ getSourceFileLike?(fileName: string): SourceFileLike | undefined;
314-
/* @internal */ getPackageJsonsVisibleToFile?(fileName: string, rootDir?: string): readonly PackageJsonInfo[];
314+
/* @internal */ getPackageJsonsVisibleToFile?(fileName: string, rootDir?: string): readonly ProjectPackageJsonInfo[];
315315
/* @internal */ getNearestAncestorDirectoryWithPackageJson?(fileName: string): string | undefined;
316-
/* @internal */ getPackageJsonsForAutoImport?(rootDir?: string): readonly PackageJsonInfo[];
316+
/* @internal */ getPackageJsonsForAutoImport?(rootDir?: string): readonly ProjectPackageJsonInfo[];
317317
/* @internal */ getCachedExportInfoMap?(): ExportInfoMap;
318318
/* @internal */ getModuleSpecifierCache?(): ModuleSpecifierCache;
319319
/* @internal */ setCompilerHost?(host: CompilerHost): void;

src/services/utilities.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3004,12 +3004,12 @@ namespace ts {
30043004
return packageJson;
30053005
}
30063006

3007-
export function getPackageJsonsVisibleToFile(fileName: string, host: LanguageServiceHost): readonly PackageJsonInfo[] {
3007+
export function getPackageJsonsVisibleToFile(fileName: string, host: LanguageServiceHost): readonly ProjectPackageJsonInfo[] {
30083008
if (!host.fileExists) {
30093009
return [];
30103010
}
30113011

3012-
const packageJsons: PackageJsonInfo[] = [];
3012+
const packageJsons: ProjectPackageJsonInfo[] = [];
30133013
forEachAncestorDirectory(getDirectoryPath(fileName), ancestor => {
30143014
const packageJsonFileName = combinePaths(ancestor, "package.json");
30153015
if (host.fileExists(packageJsonFileName)) {
@@ -3023,7 +3023,7 @@ namespace ts {
30233023
return packageJsons;
30243024
}
30253025

3026-
export function createPackageJsonInfo(fileName: string, host: { readFile?(fileName: string): string | undefined }): PackageJsonInfo | undefined {
3026+
export function createPackageJsonInfo(fileName: string, host: { readFile?(fileName: string): string | undefined }): ProjectPackageJsonInfo | undefined {
30273027
if (!host.readFile) {
30283028
return undefined;
30293029
}
@@ -3032,7 +3032,7 @@ namespace ts {
30323032
const dependencyKeys = ["dependencies", "devDependencies", "optionalDependencies", "peerDependencies"] as const;
30333033
const stringContent = host.readFile(fileName) || "";
30343034
const content = tryParseJson(stringContent) as PackageJsonRaw | undefined;
3035-
const info: Pick<PackageJsonInfo, typeof dependencyKeys[number]> = {};
3035+
const info: Pick<ProjectPackageJsonInfo, typeof dependencyKeys[number]> = {};
30363036
if (content) {
30373037
for (const key of dependencyKeys) {
30383038
const dependencies = content[key];

0 commit comments

Comments
 (0)