11package registry
22
33import (
4+ "fmt"
5+ "log/slog"
46 "os"
57 "path"
68 "path/filepath"
79 "strings"
810
911 "github.com/dpup/protoc-gen-grpc-gateway-ts/data"
1012 "github.com/pkg/errors"
11- log "github.com/sirupsen/logrus" //nolint: depguard // not sure, will remove
1213 "google.golang.org/protobuf/types/descriptorpb"
1314 "google.golang.org/protobuf/types/pluginpb"
1415)
@@ -65,14 +66,14 @@ type Registry struct {
6566// NewRegistry initialise the registry and return the instance.
6667func NewRegistry (opts Options ) (* Registry , error ) {
6768 tsImportRoots , tsImportRootAliases , err := getTSImportRootInformation (opts )
68- log . Debugf ("found ts import roots %v" , tsImportRoots )
69- log . Debugf ("found ts import root aliases %v" , tsImportRootAliases )
69+ slog . Debug ("found ts import roots" , slog . Any ( "importRoots" , tsImportRoots ) )
70+ slog . Debug ("found ts import root aliases" , slog . Any ( "importRootAliases" , tsImportRootAliases ) )
7071 if err != nil {
7172 return nil , errors .Wrap (err , "error getting common import root information" )
7273 }
7374
74- log . Debugf ("found fetch module directory %s" , opts .FetchModuleDirectory )
75- log . Debugf ("found fetch module name %s" , opts .FetchModuleFilename )
75+ slog . Debug ("found fetch module directory" , slog . String ( "moduleDir" , opts .FetchModuleDirectory ) )
76+ slog . Debug ("found fetch module name" , slog . String ( "moduleName" , opts .FetchModuleFilename ) )
7677
7778 return & Registry {
7879 Options : opts ,
@@ -161,7 +162,7 @@ func (r *Registry) Analyse(req *pluginpb.CodeGeneratorRequest) (map[string]*data
161162 }
162163
163164 files := req .GetProtoFile ()
164- log . Debugf ("about to start anaylyse files, %d in total" , len (files ))
165+ slog . Debug ("about to start anaylyse files" , slog . Int ( "count" , len (files ) ))
165166 data := make (map [string ]* data.File )
166167 // analyse all files in the request first
167168 for _ , f := range files {
@@ -258,9 +259,9 @@ func (r *Registry) getSourceFileForImport(source, target, root, alias string) (s
258259 }
259260
260261 ret = strings .ReplaceAll (absTarget , absRoot , alias )
261- log . Debugf ( "replacing root alias %s for %s, result: %s" , alias , target , ret )
262+ slog . Debug ( fmt . Sprintf ( "replacing root alias %s for %s, result: %s" , alias , target , ret ) )
262263 } else { // return relative path here
263- log . Debugf ("no root alias found, trying to get the relative path for %s" , target )
264+ slog . Debug ("no root alias found, trying to get the relative path" , slog . String ( "target" , target ) )
264265 absSource , err := filepath .Abs (source )
265266 if err != nil {
266267 return "" , errors .Wrapf (err , "error looking up absolute directory with base dir: %s" , source )
@@ -272,14 +273,14 @@ func (r *Registry) getSourceFileForImport(source, target, root, alias string) (s
272273 }
273274
274275 slashPath := filepath .ToSlash (ret )
275- log . Debugf ( "got relative path %s for %s" , target , slashPath )
276+ slog . Debug ( fmt . Sprintf ( "got relative path %s for %s" , target , slashPath ) )
276277
277278 // sub directory will not have relative path ./, if this happens, prepend one
278279 if ! strings .HasPrefix (slashPath , "../" ) {
279280 ret = filepath .FromSlash ("./" + slashPath )
280281 }
281282
282- log . Debugf ( "no root alias found, trying to get the relative path for %s, result: %s" , target , ret )
283+ slog . Debug ( fmt . Sprintf ( "no root alias found, trying to get the relative path for %s, result: %s" , target , ret ) )
283284 }
284285
285286 // remove .ts suffix if there's any
@@ -293,7 +294,7 @@ func (r *Registry) getSourceFileForImport(source, target, root, alias string) (s
293294
294295func (r * Registry ) collectExternalDependenciesFromData (filesData map [string ]* data.File ) error {
295296 for _ , fileData := range filesData {
296- log . Debugf ("collecting dependencies information for %s" , fileData .TSFileName )
297+ slog . Debug ("collecting dependencies information" , slog . String ( "fileName" , fileData .TSFileName ) )
297298 // dependency group up the dependency by package+file
298299 dependencies := make (map [string ]* data.Dependency )
299300 for _ , typeName := range fileData .ExternalDependingTypes {
@@ -318,7 +319,7 @@ func (r *Registry) collectExternalDependenciesFromData(filesData map[string]*dat
318319 target := data .GetTSFileName (typeInfo .File )
319320 var sourceFile string
320321 if pkg , ok := r .TSPackages [target ]; ok {
321- log . Debugf ("package import override %s has been found for file %s" , pkg , target )
322+ slog . Debug ("package import override has been found" , slog . String ( "pkg" , pkg ), slog . String ( " target" , target ) )
322323 sourceFile = pkg
323324 } else {
324325 foundAtRoot , alias , err := r .findRootAliasForPath (func (absRoot string ) (bool , error ) {
0 commit comments