Replace api.GenerateOptions Dir/File with Config io.Reader

The struct collapses to five fields: Config (io.Reader), Stderr, Write,
Diff, InsecureProcessPluginNames. api.Generate parses the config from
the reader and treats every relative path in it as relative to the
current working directory.

CLI: each command opens the config file, reads its bytes, parses it once
to extract declared process-plugin names, then chdirs to the config's
directory before invoking api.Generate. Single-process so chdir is fine.

Tests: a new mutatedConfigBytes helper parses the test's sqlc.yaml,
forces version "2", rewrites every schema/queries/output path to be
absolute relative to the test directory, and re-encodes as YAML — so
api.Generate works without knowing the source directory. Optional
mutate callback applies extra changes (managed-db servers etc.) and
also drops a temp file alongside the original for cmd.Vet which still
takes a config path.

cmd/process.go and cmd/vet.go now skip joining their dir parameter when
the config-supplied path is already absolute.

KNOWN ISSUE: TestReplay parse-error tests and the diff_output tests
fail because the api now emits absolute paths in error messages and
unified-diff labels (no config-dir context to strip). Either add a
BaseDir hint back to GenerateOptions or update the affected test
expectations to match.

https://claude.ai/code/session_01RCzB2JR5Y5ScFDUmwcxGVZ

Author: claude

internal/api/config.go

@@ -11,7 +11,6 @@ import (
 	"path/filepath"
 	"runtime/trace"
 	"sort"
-	"strings"
 
 	"github.com/cubicdaiya/gonp"
 )
@@ -31,10 +30,12 @@ func writeFiles(ctx context.Context, files map[string]string, stderr io.Writer)
 	return nil
 }
 
-func diffFiles(ctx context.Context, dir string, files map[string]string, stderr io.Writer) error {
+func diffFiles(ctx context.Context, files map[string]string, stderr io.Writer) error {
 	defer trace.StartRegion(ctx, "checkfiles").End()
 	var errored bool
 
+	wd, _ := os.Getwd()
+
 	keys := make([]string, 0, len(files))
 	for k := range files {
 		keys = append(keys, k)
@@ -59,8 +60,14 @@ func diffFiles(ctx context.Context, dir string, files map[string]string, stderr
 
 		if len(uniHunks) > 0 {
 			errored = true
-			fmt.Fprintf(stderr, "--- a%s\n", strings.TrimPrefix(filename, dir))
-			fmt.Fprintf(stderr, "+++ b%s\n", strings.TrimPrefix(filename, dir))
+			label := filename
+			if wd != "" {
+				if rel, err := filepath.Rel(wd, filename); err == nil {
+					label = "/" + rel
+				}
+			}
+			fmt.Fprintf(stderr, "--- a%s\n", label)
+			fmt.Fprintf(stderr, "+++ b%s\n", label)
 			d.FprintUniHunks(stderr, uniHunks)
 		}
 	}

internal/api/diff.go

@@ -2,6 +2,7 @@ package api
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"path/filepath"
@@ -13,26 +14,24 @@ import (
 	"github.com/sqlc-dev/sqlc/internal/config"
 )
 
-// GenerateOptions controls a single Generate invocation.
+// GenerateOptions controls a single Generate invocation. Paths declared in the
+// configuration are resolved relative to the current working directory, so
+// callers wanting a different base directory should either pass absolute
+// paths in the config or os.Chdir before calling.
 type GenerateOptions struct {
-	// Dir is the working directory used to resolve the config file and any
-	// relative schema/query paths within it.
-	Dir string
-
-	// File is the configuration filename to use, relative to Dir. When empty,
-	// Generate looks for sqlc.yaml, sqlc.yml, or sqlc.json in Dir.
-	File string
+	// Config is the sqlc configuration as a YAML or JSON document. Required.
+	Config io.Reader
 
 	// Stderr receives diagnostic output. If nil, output is discarded.
 	Stderr io.Writer
 
-	// Write, when true, writes the generated files to disk after a successful
-	// generate. Failures are reported via GenerateResult.Errors.
+	// Write writes the generated files to disk after a successful generate.
+	// Failures are reported via GenerateResult.Errors.
 	Write bool
 
-	// Diff, when true, compares each generated file against any existing file
-	// on disk and writes a unified diff for differences to Stderr. If any
-	// differences are found, an error is appended to GenerateResult.Errors.
+	// Diff compares each generated file against any existing file on disk and
+	// writes a unified diff for differences to Stderr. If any differences are
+	// found, an error is appended to GenerateResult.Errors.
 	Diff bool
 
 	// InsecureProcessPluginNames is the allowlist of process-based plugin
@@ -45,9 +44,7 @@ type GenerateOptions struct {
 	InsecureProcessPluginNames []string
 }
 
-// GenerateResult is the outcome of a Generate call. Files maps absolute output
-// paths to file contents; callers are responsible for writing them to disk if
-// desired. Errors collects any errors encountered during code generation.
+// GenerateResult is the outcome of a Generate call.
 type GenerateResult struct {
 	// Files maps absolute output paths to generated file contents.
 	Files map[string]string
@@ -58,9 +55,7 @@ type GenerateResult struct {
 }
 
 // Generate parses the sqlc configuration referenced by opts and runs every
-// configured codegen target. The returned GenerateResult always has a non-nil
-// Files map; the map is empty when generation fails before any files are
-// produced.
+// configured codegen target.
 func Generate(ctx context.Context, opts GenerateOptions) GenerateResult {
 	stderr := opts.Stderr
 	if stderr == nil {
@@ -69,15 +64,30 @@ func Generate(ctx context.Context, opts GenerateOptions) GenerateResult {
 
 	res := GenerateResult{Files: map[string]string{}}
 
-	configPath, conf, err := readConfig(stderr, opts.Dir, opts.File)
+	if opts.Config == nil {
+		err := errors.New("GenerateOptions.Config is required")
+		fmt.Fprintln(stderr, err)
+		res.Errors = append(res.Errors, err)
+		return res
+	}
+
+	conf, err := config.ParseConfig(opts.Config)
 	if err != nil {
+		switch err {
+		case config.ErrMissingVersion:
+			fmt.Fprint(stderr, errMessageNoVersion)
+		case config.ErrUnknownVersion:
+			fmt.Fprint(stderr, errMessageUnknownVersion)
+		case config.ErrNoPackages:
+			fmt.Fprint(stderr, errMessageNoPackages)
+		}
+		fmt.Fprintf(stderr, "error parsing config: %s\n", err)
 		res.Errors = append(res.Errors, err)
 		return res
 	}
 
-	base := filepath.Base(configPath)
-	if err := config.Validate(conf); err != nil {
-		fmt.Fprintf(stderr, "error validating %s: %s\n", base, err)
+	if err := config.Validate(&conf); err != nil {
+		fmt.Fprintf(stderr, "error validating config: %s\n", err)
 		res.Errors = append(res.Errors, err)
 		return res
 	}
@@ -88,18 +98,15 @@ func Generate(ctx context.Context, opts GenerateOptions) GenerateResult {
 		}
 		if !slices.Contains(opts.InsecureProcessPluginNames, plug.Name) {
 			err := fmt.Errorf("process plugin %q is not in InsecureProcessPluginNames; refusing to run", plug.Name)
-			fmt.Fprintf(stderr, "error validating %s: %s\n", base, err)
+			fmt.Fprintf(stderr, "error validating config: %s\n", err)
 			res.Errors = append(res.Errors, err)
 			return res
 		}
 	}
 
-	g := &generator{
-		dir:    opts.Dir,
-		output: map[string]string{},
-	}
+	g := &generator{output: map[string]string{}}
 
-	if err := processQuerySets(ctx, g, conf, opts.Dir, stderr); err != nil {
+	if err := processQuerySets(ctx, g, &conf, stderr); err != nil {
 		res.Errors = append(res.Errors, err)
 		return res
 	}
@@ -113,17 +120,31 @@ func Generate(ctx context.Context, opts GenerateOptions) GenerateResult {
 	}
 
 	if opts.Diff {
-		if err := diffFiles(ctx, opts.Dir, res.Files, stderr); err != nil {
+		if err := diffFiles(ctx, res.Files, stderr); err != nil {
 			res.Errors = append(res.Errors, err)
 		}
 	}
 
 	return res
 }
 
+const errMessageNoVersion = `The configuration must have a version number.
+Set the version to 1 or 2 at the top of the config:
+
+{
+  "version": "1"
+  ...
+}
+`
+
+const errMessageUnknownVersion = `The configuration has an invalid version number.
+The supported version can only be "1" or "2".
+`
+
+const errMessageNoPackages = `No packages are configured`
+
 type generator struct {
 	m      sync.Mutex
-	dir    string
 	output map[string]string
 }
 
@@ -162,23 +183,25 @@ func (g *generator) ProcessResult(ctx context.Context, combo config.CombinedSett
 		files[file.Name] = string(file.Contents)
 	}
 	g.m.Lock()
+	defer g.m.Unlock()
 
-	// out is specified by the user, not a plugin
-	absout := filepath.Join(g.dir, out)
+	absout, err := filepath.Abs(out)
+	if err != nil {
+		return err
+	}
 
 	for n, source := range files {
-		filename := filepath.Join(g.dir, out, n)
-		// filepath.Join calls filepath.Clean which should remove all "..", but
-		// double check to make sure
+		filename, err := filepath.Abs(filepath.Join(out, n))
+		if err != nil {
+			return err
+		}
 		if strings.Contains(filename, "..") {
 			return fmt.Errorf("invalid file output path: %s", filename)
 		}
-		// The output file must be contained inside the output directory
 		if !strings.HasPrefix(filename, absout) {
 			return fmt.Errorf("invalid file output path: %s", filename)
 		}
 		g.output[filename] = source
 	}
-	g.m.Unlock()
 	return nil
 }

internal/api/generate.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"os"
 	"path/filepath"
 	"runtime/trace"
 
@@ -14,15 +15,21 @@ import (
 	"github.com/sqlc-dev/sqlc/internal/opts"
 )
 
-func printFileErr(stderr io.Writer, dir string, fileErr *multierr.FileError) {
-	filename, err := filepath.Rel(dir, fileErr.Filename)
+func printFileErr(stderr io.Writer, fileErr *multierr.FileError) {
+	wd, err := os.Getwd()
 	if err != nil {
-		filename = fileErr.Filename
+		wd = ""
+	}
+	filename := fileErr.Filename
+	if wd != "" {
+		if rel, err := filepath.Rel(wd, fileErr.Filename); err == nil {
+			filename = rel
+		}
 	}
 	fmt.Fprintf(stderr, "%s:%d:%d: %s\n", filename, fileErr.Line, fileErr.Column, fileErr.Err)
 }
 
-func parse(ctx context.Context, name, dir string, sql config.SQL, combo config.CombinedSettings, parserOpts opts.Parser, stderr io.Writer) (*compiler.Result, bool) {
+func parse(ctx context.Context, name string, sql config.SQL, combo config.CombinedSettings, parserOpts opts.Parser, stderr io.Writer) (*compiler.Result, bool) {
 	defer trace.StartRegion(ctx, "parse").End()
 	c, err := compiler.NewCompiler(sql, combo, parserOpts)
 	defer func() {
@@ -38,7 +45,7 @@ func parse(ctx context.Context, name, dir string, sql config.SQL, combo config.C
 		fmt.Fprintf(stderr, "# package %s\n", name)
 		if parserErr, ok := err.(*multierr.Error); ok {
 			for _, fileErr := range parserErr.Errs() {
-				printFileErr(stderr, dir, fileErr)
+				printFileErr(stderr, fileErr)
 			}
 		} else {
 			fmt.Fprintf(stderr, "error parsing schema: %s\n", err)
@@ -52,7 +59,7 @@ func parse(ctx context.Context, name, dir string, sql config.SQL, combo config.C
 		fmt.Fprintf(stderr, "# package %s\n", name)
 		if parserErr, ok := err.(*multierr.Error); ok {
 			for _, fileErr := range parserErr.Errs() {
-				printFileErr(stderr, dir, fileErr)
+				printFileErr(stderr, fileErr)
 			}
 		} else {
 			fmt.Fprintf(stderr, "error parsing queries: %s\n", err)