Use pointers for GetPackage and implement WIP GetResolvedProjectReference

Author: GGomez99

internal/modulespecifiers/specifiers.go

@@ -675,7 +675,7 @@ func tryGetModuleNameAsNodeModule(
 		}
 
 		if fromLocator != nil && toLocator != nil {
-			fromInfo := pnpApi.GetPackage(*fromLocator)
+			fromInfo := pnpApi.GetPackage(fromLocator)
 
 			useToLocator := false
 
@@ -696,7 +696,7 @@ func tryGetModuleNameAsNodeModule(
 		}
 
 		if parts != nil {
-			toInfo := pnpApi.GetPackage(*toLocator)
+			toInfo := pnpApi.GetPackage(toLocator)
 			parts = &NodeModulePathParts{
 				TopLevelNodeModulesIndex: -1,
 				TopLevelPackageNameIndex: -1,

internal/pnp/pnpapi.go

@@ -50,7 +50,7 @@ func (p *PnpApi) ResolveToUnqualified(specifier string, parentPath string) (stri
 		return "", nil
 	}
 
-	parentPkg := p.GetPackage(*parentLocator)
+	parentPkg := p.GetPackage(parentLocator)
 
 	var referenceOrAlias *PackageDependency
 	for _, dep := range parentPkg.PackageDependencies {
@@ -99,9 +99,9 @@ func (p *PnpApi) ResolveToUnqualified(specifier string, parentPath string) (stri
 
 	var dependencyPkg *PackageInfo
 	if referenceOrAlias.IsAlias() {
-		dependencyPkg = p.GetPackage(Locator{Name: referenceOrAlias.AliasName, Reference: referenceOrAlias.Reference})
+		dependencyPkg = p.GetPackage(&Locator{Name: referenceOrAlias.AliasName, Reference: referenceOrAlias.Reference})
 	} else {
-		dependencyPkg = p.GetPackage(Locator{Name: referenceOrAlias.Ident, Reference: referenceOrAlias.Reference})
+		dependencyPkg = p.GetPackage(&Locator{Name: referenceOrAlias.Ident, Reference: referenceOrAlias.Reference})
 	}
 
 	return filepath.Join(p.manifest.dirPath, dependencyPkg.PackageLocation, modulePath), nil
@@ -123,7 +123,7 @@ func (p *PnpApi) findClosestPnpManifest() (*PnpManifestData, error) {
 	}
 }
 
-func (p *PnpApi) GetPackage(locator Locator) *PackageInfo {
+func (p *PnpApi) GetPackage(locator *Locator) *PackageInfo {
 	packageRegistryMap := p.manifest.packageRegistryMap
 	packageInfo, ok := packageRegistryMap[locator.Name][locator.Reference]
 	if !ok {
@@ -177,7 +177,7 @@ func (p *PnpApi) FindLocator(parentPath string) (*Locator, error) {
 }
 
 func (p *PnpApi) ResolveViaFallback(name string) *PackageDependency {
-	topLevelPkg := p.GetPackage(Locator{Name: "", Reference: ""})
+	topLevelPkg := p.GetPackage(&Locator{Name: "", Reference: ""})
 
 	if topLevelPkg != nil {
 		for _, dep := range topLevelPkg.PackageDependencies {
@@ -250,12 +250,12 @@ func (p *PnpApi) GetPnpTypeRoots(currentDirectory string) []string {
 		return []string{}
 	}
 
-	packageDependencies := p.GetPackage(*currentPackage).PackageDependencies
+	packageDependencies := p.GetPackage(currentPackage).PackageDependencies
 
 	typeRoots := []string{}
 	for _, dep := range packageDependencies {
 		if strings.HasPrefix(dep.Ident, "@types/") && dep.Reference != "" {
-			packageInfo := p.GetPackage(Locator{Name: dep.Ident, Reference: dep.Reference})
+			packageInfo := p.GetPackage(&Locator{Name: dep.Ident, Reference: dep.Reference})
 			typeRoots = append(typeRoots, path.Dir(path.Join(p.manifest.dirPath, packageInfo.PackageLocation)))
 		}
 	}

internal/project/project.go

@@ -291,7 +291,11 @@ func (p *Project) GetSourceFile(opts ast.SourceFileParseOptions) *ast.SourceFile
 
 // GetResolvedProjectReference implements compiler.CompilerHost.
 func (p *Project) GetResolvedProjectReference(fileName string, path tspath.Path) *tsoptions.ParsedCommandLine {
-	// TODO, we might need to add the code below for pnp (converted to go)
+	config := p.host.ConfigFileRegistry().acquireConfig(fileName, path, p, nil)
+	if config == nil {
+		return nil
+	}
+	// TODO fix this and identify cases where we do need this
 
 	// With Plug'n'Play, dependencies that list peer dependencies
 	// are "virtualized": they are resolved to a unique (virtual)
@@ -308,34 +312,43 @@ func (p *Project) GetResolvedProjectReference(fileName string, path tspath.Path)
 	// user-provided references in our references by directly querying
 	// the PnP API. This way users don't have to know the virtual paths,
 	// but we still support them just fine even through references.
-
 	// pnpApi := pnp.GetPnpApi(fileName)
 	// if pnpApi != nil {
-	// 	pnpApi.GetPackage(fileName)
+	// 	basePath := p.GetCurrentDirectory()
+
+	// 	getPnpPath := func(path string) string {
+	// 		targetLocator, err := pnpApi.FindLocator(path + "/")
+	// 		if err != nil {
+	// 			return path
+	// 		}
+
+	// 		packageLocation := tspath.ResolvePath(basePath, pnpApi.GetPackage(targetLocator).PackageLocation)
+
+	// 		compareOptions := tspath.ComparePathsOptions{
+	// 			UseCaseSensitiveFileNames: p.host.FS().UseCaseSensitiveFileNames(),
+	// 			CurrentDirectory:          basePath,
+	// 		}
+
+	// 		request := tspath.CombinePaths(targetLocator.Name, tspath.GetRelativePathFromDirectory(packageLocation, path, compareOptions))
+	// 		unqualified, err := pnpApi.ResolveToUnqualified(request, basePath+"/")
+	// 		if err != nil {
+	// 			return path
+	// 		}
+
+	// 		return unqualified
+	// 	}
+
+	// 	for _, ref := range config.ProjectReferences() {
+	// 		ref.Path = getPnpPath(ref.Path)
+	// 	}
+
+	// 	fmt.Println("Project refs after")
+	// 	for _, ref := range config.ProjectReferences() {
+	// 		fmt.Println("Project ref", ref.Path)
+	// 	}
 	// }
 
-	//         const basePath = this.getCurrentDirectory();
-
-	//         const getPnpPath = (path: string) => {
-	//             try {
-	//                 const pnpApi = getPnpApi(`${path}/`);
-	//                 if (!pnpApi) {
-	//                     return path;
-	//                 }
-	//                 const targetLocator = pnpApi.findPackageLocator(`${path}/`);
-	//                 const { packageLocation } = pnpApi.getPackageInformation(targetLocator);
-	//                 const request = combinePaths(targetLocator.name, getRelativePathFromDirectory(packageLocation, path, /*ignoreCase*/ false));
-	//                 return pnpApi.resolveToUnqualified(request, `${basePath}/`);
-	//             }
-	//             catch {
-	//                 // something went wrong with the resolution, try not to fail
-	//                 return path;
-	//             }
-	//         };
-
-	// Then run getPnpPath on all resolvedReferences from acquireConfig()
-
-	return p.host.ConfigFileRegistry().acquireConfig(fileName, path, p, nil)
+	return config
 }
 
 // Updates the program if needed.