readd modulespecifiers and remove uint8 type

johnfav03 · johnfav03 · commit fb5e4c628a7c · 2025-10-03T14:02:24.000-04:00
diff --git a/internal/modulespecifiers/preferences.go b/internal/modulespecifiers/preferences.go
@@ -141,6 +141,7 @@ func getPreferredEnding(
 type ModuleSpecifierPreferences struct {
 	relativePreference                RelativePreferenceKind
 	getAllowedEndingsInPreferredOrder func(syntaxImpliedNodeFormat core.ResolutionMode) []ModuleSpecifierEnding
+	packageJsonAutoImports            IncludePackageJsonAutoImports
 	excludeRegexes                    []string
 }
 
@@ -227,6 +228,7 @@ func getModuleSpecifierPreferences(
 	}
 
 	return ModuleSpecifierPreferences{
+		packageJsonAutoImports:            prefs.IncludePackageJsonAutoImports,
 		excludeRegexes:                    excludes,
 		relativePreference:                relativePreference,
 		getAllowedEndingsInPreferredOrder: getAllowedEndingsInPreferredOrder,
diff --git a/internal/modulespecifiers/specifiers.go b/internal/modulespecifiers/specifiers.go
@@ -493,7 +493,7 @@ func getLocalModuleSpecifier(
 	}
 
 	var fromPackageJsonImports string
-	if !pathsOnly && preferences.packageJsonAutoImports != PackageJsonAutoImportsOff {
+	if !pathsOnly && preferences.packageJsonAutoImports != IncludePackageJsonAutoImportsOff {
 		fromPackageJsonImports = tryGetModuleNameFromPackageJsonImports(
 			moduleFileName,
 			sourceDirectory,
diff --git a/internal/modulespecifiers/types.go b/internal/modulespecifiers/types.go
@@ -123,14 +123,6 @@ const (
 	ModuleSpecifierEndingTsExtension
 )
 
-type PackageJsonAutoImports uint8
-
-const (
-	PackageJsonAutoImportsAuto PackageJsonAutoImports = iota
-	PackageJsonAutoImportsOn
-	PackageJsonAutoImportsOff
-)
-
 type MatchingMode uint8
 
 const (

Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,7 @@ func getPreferredEnding(`
`141`	`141`	`type ModuleSpecifierPreferences struct {`
`142`	`142`	`relativePreference RelativePreferenceKind`
`143`	`143`	`getAllowedEndingsInPreferredOrder func(syntaxImpliedNodeFormat core.ResolutionMode) []ModuleSpecifierEnding`
	`144`	`+ packageJsonAutoImports IncludePackageJsonAutoImports`
`144`	`145`	`excludeRegexes []string`
`145`	`146`	`}`
`146`	`147`
`@@ -227,6 +228,7 @@ func getModuleSpecifierPreferences(`
`227`	`228`	`}`
`228`	`229`
`229`	`230`	`return ModuleSpecifierPreferences{`
	`231`	`+ packageJsonAutoImports: prefs.IncludePackageJsonAutoImports,`
`230`	`232`	`excludeRegexes: excludes,`
`231`	`233`	`relativePreference: relativePreference,`
`232`	`234`	`getAllowedEndingsInPreferredOrder: getAllowedEndingsInPreferredOrder,`
Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,7 @@ func getLocalModuleSpecifier(`
`493`	`493`	`}`
`494`	`494`
`495`	`495`	`var fromPackageJsonImports string`
`496`		`- if !pathsOnly && preferences.packageJsonAutoImports != PackageJsonAutoImportsOff {`
	`496`	`+ if !pathsOnly && preferences.packageJsonAutoImports != IncludePackageJsonAutoImportsOff {`
`497`	`497`	`fromPackageJsonImports = tryGetModuleNameFromPackageJsonImports(`
`498`	`498`	`moduleFileName,`
`499`	`499`	`sourceDirectory,`