sourceFiles

Author: asmyasnikov

internal/cmd/generate.go

@@ -131,13 +131,13 @@ func readConfig(stderr io.Writer, dir, filename string) (string, *config.Config,
 	return configPath, &conf, nil
 }
 
-// GenerateInputs holds in-memory config and optional file contents so generate can run
+// sourceFiles holds in-memory config and optional file contents so generate can run
 // without reading from disk (e.g. in tests). For production, Generate reads from FS and
 // fills FileContents before calling generate.
-type GenerateInputs struct {
-	Config      *config.Config
-	ConfigPath  string
-	Dir         string
+type sourceFiles struct {
+	Config       *config.Config
+	ConfigPath   string
+	Dir          string
 	FileContents map[string][]byte // path -> content; keys match paths used when reading (e.g. filepath.Join(dir, "schema.sql"))
 }
 
@@ -166,7 +166,7 @@ func Generate(ctx context.Context, dir, filename string, o *Options) (map[string
 		return remoteGenerate(ctx, configPath, conf, dir, stderr)
 	}
 
-	inputs := &GenerateInputs{Config: conf, ConfigPath: configPath, Dir: dir}
+	inputs := &sourceFiles{Config: conf, ConfigPath: configPath, Dir: dir}
 	inputs.FileContents, err = loadFileContentsFromFS(conf, dir)
 	if err != nil {
 		return nil, err
@@ -176,7 +176,7 @@ func Generate(ctx context.Context, dir, filename string, o *Options) (map[string
 
 // generate performs codegen using in-memory inputs. It is used by Generate (with contents
 // loaded from disk) and by tests (with pre-filled Config and FileContents, no temp files).
-func generate(ctx context.Context, inputs *GenerateInputs, o *Options) (map[string]string, error) {
+func generate(ctx context.Context, inputs *sourceFiles, o *Options) (map[string]string, error) {
 	g := &generator{
 		dir:    inputs.Dir,
 		output: map[string]string{},
@@ -228,9 +228,9 @@ func loadFileContentsFromFS(conf *config.Config, dir string) (map[string][]byte,
 }
 
 type generator struct {
-	m                     sync.Mutex
-	dir                   string
-	output                map[string]string
+	m                      sync.Mutex
+	dir                    string
+	output                 map[string]string
 	codegenHandlerOverride grpc.ClientConnInterface
 }
 

internal/cmd/plugin_engine_path.go

@@ -29,7 +29,7 @@ var defaultCommentSyntax = metadata.CommentSyntax(source.CommentSyntax{Dash: tru
 // engine plugin via ParseRequest; the responses are turned into compiler.Result and
 // passed to ProcessResult. No AST or compiler parsing is used.
 // When inputs.FileContents is set, schema/query bytes are taken from it (no disk read).
-func runPluginQuerySet(ctx context.Context, rp ResultProcessor, name, dir string, sql OutputPair, combo config.CombinedSettings, inputs *GenerateInputs, o *Options) error {
+func runPluginQuerySet(ctx context.Context, rp ResultProcessor, name, dir string, sql OutputPair, combo config.CombinedSettings, inputs *sourceFiles, o *Options) error {
 	enginePlugin, found := config.FindEnginePlugin(&combo.Global, string(combo.Package.Engine))
 	if !found || enginePlugin.Process == nil {
 		e := string(combo.Package.Engine)

internal/cmd/plugin_engine_test.go

@@ -120,7 +120,7 @@ func TestPluginPipeline_FullPipeline(t *testing.T) {
 		t.Fatalf("parse config: %v", err)
 	}
 
-	inputs := &GenerateInputs{
+	inputs := &sourceFiles{
 		Config:     &conf,
 		ConfigPath: "sqlc.yaml",
 		Dir:        ".",
@@ -231,7 +231,7 @@ func TestPluginPipeline_WithoutOverride_UsesPluginPackage(t *testing.T) {
 	if err != nil {
 		t.Fatalf("parse config: %v", err)
 	}
-	inputs := &GenerateInputs{
+	inputs := &sourceFiles{
 		Config:     &conf,
 		ConfigPath: "sqlc.yaml",
 		Dir:        ".",

internal/cmd/process.go

@@ -51,11 +51,11 @@ func Process(ctx context.Context, rp ResultProcessor, dir, filename string, o *O
 		return err
 	}
 
-	inputs := &GenerateInputs{Config: conf, ConfigPath: configPath, Dir: dir}
+	inputs := &sourceFiles{Config: conf, ConfigPath: configPath, Dir: dir}
 	return processQuerySets(ctx, rp, inputs, o)
 }
 
-func processQuerySets(ctx context.Context, rp ResultProcessor, inputs *GenerateInputs, o *Options) error {
+func processQuerySets(ctx context.Context, rp ResultProcessor, inputs *sourceFiles, o *Options) error {
 	stderr := o.Stderr
 	conf := inputs.Config
 	dir := inputs.Dir