chore(internal): minor cleanup

Author: stainless-app[bot]

client_test.go

@@ -38,7 +38,7 @@ func TestUserAgentHeader(t *testing.T) {
 			},
 		}),
 	)
-	client.Accounts.List(context.Background())
+	_, _ = client.Accounts.List(context.Background())
 	if userAgent != fmt.Sprintf("BeeperDesktop/Go %s", internal.PackageVersion) {
 		t.Errorf("Expected User-Agent to be correct, but got: %#v", userAgent)
 	}

internal/apiform/form_test.go

@@ -585,14 +585,17 @@ func TestEncode(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			buf := bytes.NewBuffer(nil)
 			writer := multipart.NewWriter(buf)
-			writer.SetBoundary("xxx")
+			err := writer.SetBoundary("xxx")
+			if err != nil {
+				t.Errorf("setting boundary for %v failed with error %v", test.val, err)
+			}
 
-			var arrayFmt string = "indices:dots"
+			arrayFmt := "indices:dots"
 			if tags := strings.Split(name, ","); len(tags) > 1 {
 				arrayFmt = tags[1]
 			}
 
-			err := MarshalWithSettings(test.val, writer, arrayFmt)
+			err = MarshalWithSettings(test.val, writer, arrayFmt)
 			if err != nil {
 				t.Errorf("serialization of %v failed with error %v", test.val, err)
 			}

internal/apiform/tag.go

@@ -60,6 +60,8 @@ func parseApiStructTag(field reflect.StructField, tag *parsedStructTag) {
 			tag.extras = true
 		case "required":
 			tag.required = true
+		case "metadata":
+			tag.metadata = true
 		}
 	}
 }

internal/apijson/decoder.go

@@ -393,7 +393,7 @@ func (d *decoderBuilder) newStructTypeDecoder(t reflect.Type) decoderFunc {
 
 		for _, decoder := range anonymousDecoders {
 			// ignore errors
-			decoder.fn(node, value.FieldByIndex(decoder.idx), state)
+			_ = decoder.fn(node, value.FieldByIndex(decoder.idx), state)
 		}
 
 		for _, inlineDecoder := range inlineDecoders {
@@ -462,7 +462,7 @@ func (d *decoderBuilder) newStructTypeDecoder(t reflect.Type) decoderFunc {
 
 			// Handle null [param.Opt]
 			if itemNode.Type == gjson.Null && dest.IsValid() && dest.Type().Implements(reflect.TypeOf((*param.Optional)(nil)).Elem()) {
-				dest.Addr().Interface().(json.Unmarshaler).UnmarshalJSON([]byte(itemNode.Raw))
+				_ = dest.Addr().Interface().(json.Unmarshaler).UnmarshalJSON([]byte(itemNode.Raw))
 				continue
 			}
 
@@ -684,8 +684,5 @@ func guardUnknown(state *decoderState, v reflect.Value) bool {
 
 	constantString, ok := v.Interface().(interface{ Default() string })
 	named := v.Type() != stringType
-	if guardStrict(state, ok && named && v.Equal(reflect.ValueOf(constantString.Default()))) {
-		return true
-	}
-	return false
+	return guardStrict(state, ok && named && v.Equal(reflect.ValueOf(constantString.Default())))
 }

internal/apijson/encoder.go

@@ -290,27 +290,6 @@ func (e *encoder) newStructTypeEncoder(t reflect.Type) encoderFunc {
 	}
 }
 
-func (e *encoder) newFieldTypeEncoder(t reflect.Type) encoderFunc {
-	f, _ := t.FieldByName("Value")
-	enc := e.typeEncoder(f.Type)
-
-	return func(value reflect.Value) (json []byte, err error) {
-		present := value.FieldByName("Present")
-		if !present.Bool() {
-			return nil, nil
-		}
-		null := value.FieldByName("Null")
-		if null.Bool() {
-			return []byte("null"), nil
-		}
-		raw := value.FieldByName("Raw")
-		if !raw.IsNil() {
-			return e.typeEncoder(raw.Type())(raw)
-		}
-		return enc(value.FieldByName("Value"))
-	}
-}
-
 func (e *encoder) newTimeTypeEncoder() encoderFunc {
 	format := e.dateFormat
 	return func(value reflect.Value) (json []byte, err error) {

internal/apijson/enum.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"reflect"
 	"slices"
-	"sync"
 
 	"github.com/tidwall/gjson"
 )
@@ -15,7 +14,6 @@ import (
 
 type validationEntry struct {
 	field       reflect.StructField
-	required    bool
 	legalValues struct {
 		strings []string
 		// 1 represents true, 0 represents false, -1 represents either
@@ -24,9 +22,6 @@ type validationEntry struct {
 	}
 }
 
-type validatorFunc func(reflect.Value) exactness
-
-var validators sync.Map
 var validationRegistry = map[reflect.Type][]validationEntry{}
 
 func RegisterFieldValidator[T any, V string | bool | int | float64](fieldName string, values ...V) {
@@ -111,9 +106,9 @@ func (state *decoderState) validateBool(v reflect.Value) {
 		return
 	}
 	b := v.Bool()
-	if state.validator.legalValues.bools == 1 && b == false {
+	if state.validator.legalValues.bools == 1 && !b {
 		state.exactness = loose
-	} else if state.validator.legalValues.bools == 0 && b == true {
+	} else if state.validator.legalValues.bools == 0 && b {
 		state.exactness = loose
 	}
 }

internal/apijson/json_test.go

@@ -87,7 +87,7 @@ type JSONFieldStruct struct {
 	C           string              `json:"c"`
 	D           string              `json:"d"`
 	ExtraFields map[string]int64    `json:"" api:"extrafields"`
-	JSON        JSONFieldStructJSON `json:",metadata"`
+	JSON        JSONFieldStructJSON `json:"-" api:"metadata"`
 }
 
 type JSONFieldStructJSON struct {
@@ -113,12 +113,12 @@ type Union interface {
 
 type Inline struct {
 	InlineField Primitives `json:",inline"`
-	JSON        InlineJSON `json:",metadata"`
+	JSON        InlineJSON `json:"-" api:"metadata"`
 }
 
 type InlineArray struct {
 	InlineField []string   `json:",inline"`
-	JSON        InlineJSON `json:",metadata"`
+	JSON        InlineJSON `json:"-" api:"metadata"`
 }
 
 type InlineJSON struct {

internal/apijson/tag.go

@@ -57,6 +57,8 @@ func parseApiStructTag(field reflect.StructField, tag *parsedStructTag) {
 			tag.extras = true
 		case "required":
 			tag.required = true
+		case "metadata":
+			tag.metadata = true
 		}
 	}
 }

internal/apiquery/encoder.go

@@ -193,7 +193,7 @@ func (e *encoder) newStructTypeEncoder(t reflect.Type) encoderFunc {
 
 	return func(key string, value reflect.Value) (pairs []Pair, err error) {
 		for _, ef := range encoderFields {
-			var subkey string = e.renderKeyPath(key, ef.tag.name)
+			subkey := e.renderKeyPath(key, ef.tag.name)
 			if ef.tag.inline {
 				subkey = key
 			}
@@ -372,27 +372,6 @@ func (e *encoder) newPrimitiveTypeEncoder(t reflect.Type) encoderFunc {
 	}
 }
 
-func (e *encoder) newFieldTypeEncoder(t reflect.Type) encoderFunc {
-	f, _ := t.FieldByName("Value")
-	enc := e.typeEncoder(f.Type)
-
-	return func(key string, value reflect.Value) ([]Pair, error) {
-		present := value.FieldByName("Present")
-		if !present.Bool() {
-			return nil, nil
-		}
-		null := value.FieldByName("Null")
-		if null.Bool() {
-			return nil, fmt.Errorf("apiquery: field cannot be null")
-		}
-		raw := value.FieldByName("Raw")
-		if !raw.IsNil() {
-			return e.typeEncoder(raw.Type())(key, raw)
-		}
-		return enc(key, value.FieldByName("Value"))
-	}
-}
-
 func (e *encoder) newTimeTypeEncoder(_ reflect.Type) encoderFunc {
 	format := e.dateFormat
 	return func(key string, value reflect.Value) ([]Pair, error) {

internal/requestconfig/requestconfig.go

@@ -461,7 +461,7 @@ func (cfg *RequestConfig) Execute() (err error) {
 
 		// Close the response body before retrying to prevent connection leaks
 		if res != nil && res.Body != nil {
-			res.Body.Close()
+			_ = res.Body.Close()
 		}
 
 		select {
@@ -489,7 +489,7 @@ func (cfg *RequestConfig) Execute() (err error) {
 
 	if res.StatusCode >= 400 {
 		contents, err := io.ReadAll(res.Body)
-		res.Body.Close()
+		_ = res.Body.Close()
 		if err != nil {
 			return err
 		}
@@ -520,7 +520,7 @@ func (cfg *RequestConfig) Execute() (err error) {
 	}
 
 	contents, err := io.ReadAll(res.Body)
-	res.Body.Close()
+	_ = res.Body.Close()
 	if err != nil {
 		return fmt.Errorf("error reading response body: %w", err)
 	}