Skip to content

Commit 10aab61

Browse files
committed
Apply new lint fixes
1 parent 6f17800 commit 10aab61

File tree

2 files changed

+25
-28
lines changed

2 files changed

+25
-28
lines changed

internal/pnp/manifestparser.go

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func extractPnpDataStringFromPath(fs vfs.FS, path string) (string, error) {
119119
}
120120

121121
func parseManifestFromData(pnpDataString string, manifestDir string) (*PnpManifestData, error) {
122-
var rawData map[string]interface{}
122+
var rawData map[string]any
123123
if err := json.Unmarshal([]byte(pnpDataString), &rawData); err != nil {
124124
return nil, fmt.Errorf("failed to parse JSON PnP data: %w", err)
125125
}
@@ -133,12 +133,12 @@ func parseManifestFromData(pnpDataString string, manifestDir string) (*PnpManife
133133
}
134134

135135
// TODO add error handling for corrupted data
136-
func parsePnpManifest(rawData map[string]interface{}, manifestDir string) (*PnpManifestData, error) {
136+
func parsePnpManifest(rawData map[string]any, manifestDir string) (*PnpManifestData, error) {
137137
data := &PnpManifestData{dirPath: manifestDir}
138138

139-
if roots, ok := rawData["dependencyTreeRoots"].([]interface{}); ok {
139+
if roots, ok := rawData["dependencyTreeRoots"].([]any); ok {
140140
for _, root := range roots {
141-
if rootMap, ok := root.(map[string]interface{}); ok {
141+
if rootMap, ok := root.(map[string]any); ok {
142142
data.dependencyTreeRoots = append(data.dependencyTreeRoots, Locator{
143143
Name: getField(rootMap, "name", parseString),
144144
Reference: getField(rootMap, "reference", parseString),
@@ -163,9 +163,9 @@ func parsePnpManifest(rawData map[string]interface{}, manifestDir string) (*PnpM
163163

164164
data.fallbackExclusionMap = make(map[string]*FallbackExclusion)
165165

166-
if exclusions, ok := rawData["fallbackExclusionList"].([]interface{}); ok {
166+
if exclusions, ok := rawData["fallbackExclusionList"].([]any); ok {
167167
for _, exclusion := range exclusions {
168-
if exclusionArr, ok := exclusion.([]interface{}); ok && len(exclusionArr) == 2 {
168+
if exclusionArr, ok := exclusion.([]any); ok && len(exclusionArr) == 2 {
169169
name := parseString(exclusionArr[0])
170170
entries := parseStringArray(exclusionArr[1])
171171
exclusionEntry := &FallbackExclusion{
@@ -179,21 +179,21 @@ func parsePnpManifest(rawData map[string]interface{}, manifestDir string) (*PnpM
179179

180180
data.packageRegistryMap = make(map[string]map[string]*PackageInfo)
181181

182-
if registryData, ok := rawData["packageRegistryData"].([]interface{}); ok {
182+
if registryData, ok := rawData["packageRegistryData"].([]any); ok {
183183
for _, entry := range registryData {
184-
if entryArr, ok := entry.([]interface{}); ok && len(entryArr) == 2 {
184+
if entryArr, ok := entry.([]any); ok && len(entryArr) == 2 {
185185
ident := parseString(entryArr[0])
186186

187187
if data.packageRegistryMap[ident] == nil {
188188
data.packageRegistryMap[ident] = make(map[string]*PackageInfo)
189189
}
190190

191-
if versions, ok := entryArr[1].([]interface{}); ok {
191+
if versions, ok := entryArr[1].([]any); ok {
192192
for _, version := range versions {
193-
if versionArr, ok := version.([]interface{}); ok && len(versionArr) == 2 {
193+
if versionArr, ok := version.([]any); ok && len(versionArr) == 2 {
194194
reference := parseString(versionArr[0])
195195

196-
if infoMap, ok := versionArr[1].(map[string]interface{}); ok {
196+
if infoMap, ok := versionArr[1].(map[string]any); ok {
197197
packageInfo := &PackageInfo{
198198
PackageLocation: getField(infoMap, "packageLocation", parseString),
199199
PackageDependencies: getField(infoMap, "packageDependencies", parsePackageDependencies),
@@ -251,22 +251,22 @@ func (data *PnpManifestData) addPackageToTrie(ident string, reference string, pa
251251
}
252252

253253
// Helper functions for parsing JSON values - following patterns from tsoptions.parseString, etc.
254-
func parseString(value interface{}) string {
254+
func parseString(value any) string {
255255
if str, ok := value.(string); ok {
256256
return str
257257
}
258258
return ""
259259
}
260260

261-
func parseBool(value interface{}) bool {
261+
func parseBool(value any) bool {
262262
if val, ok := value.(bool); ok {
263263
return val
264264
}
265265
return false
266266
}
267267

268-
func parseStringArray(value interface{}) []string {
269-
if arr, ok := value.([]interface{}); ok {
268+
func parseStringArray(value any) []string {
269+
if arr, ok := value.([]any); ok {
270270
if arr == nil {
271271
return nil
272272
}
@@ -281,11 +281,11 @@ func parseStringArray(value interface{}) []string {
281281
return nil
282282
}
283283

284-
func parseStringPairs(value interface{}) [][2]string {
284+
func parseStringPairs(value any) [][2]string {
285285
var result [][2]string
286-
if arr, ok := value.([]interface{}); ok {
286+
if arr, ok := value.([]any); ok {
287287
for _, item := range arr {
288-
if pair, ok := item.([]interface{}); ok && len(pair) == 2 {
288+
if pair, ok := item.([]any); ok && len(pair) == 2 {
289289
result = append(result, [2]string{
290290
parseString(pair[0]),
291291
parseString(pair[1]),
@@ -296,11 +296,11 @@ func parseStringPairs(value interface{}) [][2]string {
296296
return result
297297
}
298298

299-
func parsePackageDependencies(value interface{}) []PackageDependency {
299+
func parsePackageDependencies(value any) []PackageDependency {
300300
var result []PackageDependency
301-
if arr, ok := value.([]interface{}); ok {
301+
if arr, ok := value.([]any); ok {
302302
for _, item := range arr {
303-
if pair, ok := item.([]interface{}); ok && len(pair) == 2 {
303+
if pair, ok := item.([]any); ok && len(pair) == 2 {
304304
ident := parseString(pair[0])
305305

306306
// Check if second element is string (simple reference) or array (alias)
@@ -310,7 +310,7 @@ func parsePackageDependencies(value interface{}) []PackageDependency {
310310
Reference: str,
311311
AliasName: "",
312312
})
313-
} else if aliasPair, ok := pair[1].([]interface{}); ok && len(aliasPair) == 2 {
313+
} else if aliasPair, ok := pair[1].([]any); ok && len(aliasPair) == 2 {
314314
result = append(result, PackageDependency{
315315
Ident: ident,
316316
Reference: parseString(aliasPair[1]),
@@ -323,7 +323,7 @@ func parsePackageDependencies(value interface{}) []PackageDependency {
323323
return result
324324
}
325325

326-
func getField[T any](m map[string]interface{}, key string, parser func(interface{}) T) T {
326+
func getField[T any](m map[string]any, key string, parser func(any) T) T {
327327
if val, exists := m[key]; exists {
328328
return parser(val)
329329
}

internal/pnp/pnpapi.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,8 @@ func (p *PnpApi) ResolveToUnqualified(specifier string, parentPath string) (stri
9696
if p.manifest.enableTopLevelFallback {
9797
excluded := false
9898
if exclusion, ok := p.manifest.fallbackExclusionMap[parentLocator.Name]; ok {
99-
for _, entry := range exclusion.Entries {
100-
if entry == parentLocator.Reference {
101-
excluded = true
102-
break
103-
}
99+
if slices.Contains(exclusion.Entries, parentLocator.Reference) {
100+
excluded = true
104101
}
105102
}
106103
if !excluded {

0 commit comments

Comments
 (0)