new lexutil.LexClient interface which xrpc.Client implements

lex/gen.go

···
 	pf("\t\"fmt\"\n")
 	pf("\t\"encoding/json\"\n")
 	pf("\tcbg \"github.com/whyrusleeping/cbor-gen\"\n")
-	pf("\t\"github.com/bluesky-social/indigo/xrpc\"\n")
 	pf("\t\"github.com/bluesky-social/indigo/lex/util\"\n")
 	for _, xpkg := range packages {
 		if xpkg.Prefix != pkg.Prefix {

lex/type_schema.go

···
 	pf := printerf(w)
 	fname := typename
 
-	params := "ctx context.Context, c *xrpc.Client"
+	params := "ctx context.Context, c util.LexClient"
 	inpvar := "nil"
 	inpenc := ""
 
···
 	var reqtype string
 	switch s.Type {
 	case "procedure":
-		reqtype = "xrpc.Procedure"
+		reqtype = "util.Procedure"
 	case "query":
-		reqtype = "xrpc.Query"
+		reqtype = "util.Query"
 	default:
 		return fmt.Errorf("can only generate RPC for Query or Procedure (got %s)", s.Type)
 	}
 
-	pf("\tif err := c.Do(ctx, %s, %q, \"%s\", %s, %s, %s); err != nil {\n", reqtype, inpenc, s.id, queryparams, inpvar, outvar)
+	pf("\tif err := c.LexDo(ctx, %s, %q, \"%s\", %s, %s, %s); err != nil {\n", reqtype, inpenc, s.id, queryparams, inpvar, outvar)
 	pf("\t\treturn %s\n", errRet)
 	pf("\t}\n\n")
 	pf("\treturn %s\n", outRet)

lex/util/client.go

···
+package util
+
+import (
+	"context"
+)
+
+type XRPCRequestType int
+
+const (
+	Query = XRPCRequestType(iota)
+	Procedure
+)
+
+// API client interface used in lexgen.
+type LexClient interface {
+	LexDo(ctx context.Context, kind XRPCRequestType, inpenc string, method string, params map[string]any, bodyobj any, out any) error
+}

xrpc/xrpc.go

···
 	"strings"
 	"time"
 
+	lexutil "github.com/bluesky-social/indigo/lex/util"
 	"github.com/bluesky-social/indigo/util"
 	"github.com/carlmjohnson/versioninfo"
 )
···
 	return c.Client
 }
 
-type XRPCRequestType int
+type XRPCRequestType = lexutil.XRPCRequestType
+
+var (
+	Query     = lexutil.Query
+	Procedure = lexutil.Procedure
+)
 
 type AuthInfo struct {
 	AccessJwt  string `json:"accessJwt"`
···
 	Reset     time.Time
 }
 
-const (
-	Query = XRPCRequestType(iota)
-	Procedure
-)
-
 // makeParams converts a map of string keys and any values into a URL-encoded string.
 // If a value is a slice of strings, it will be joined with commas.
 // Generally the values will be strings, numbers, booleans, or slices of strings
···
 	return params.Encode()
 }
 
-func (c *Client) Do(ctx context.Context, kind XRPCRequestType, inpenc string, method string, params map[string]interface{}, bodyobj interface{}, out interface{}) error {
+func (c *Client) Do(ctx context.Context, kind lexutil.XRPCRequestType, inpenc string, method string, params map[string]interface{}, bodyobj interface{}, out interface{}) error {
 	var body io.Reader
 	if bodyobj != nil {
 		if rr, ok := bodyobj.(io.Reader); ok {
···
 
 	var m string
 	switch kind {
-	case Query:
+	case lexutil.Query:
 		m = "GET"
-	case Procedure:
+	case lexutil.Procedure:
 		m = "POST"
 	default:
 		return fmt.Errorf("unsupported request kind: %d", kind)
···
 
 	return nil
 }
+
+func (c *Client) LexDo(ctx context.Context, kind lexutil.XRPCRequestType, inpenc string, method string, params map[string]any, bodyobj any, out any) error {
+	return c.Do(ctx, kind, inpenc, method, params, bodyobj, out)
+}