chore: maintain StorageState type (#583)

Author: canstand

apiresponse_assertions.go

@@ -67,9 +67,6 @@ func subString(s string, start, length int) string {
 		length = 0
 	}
 	rs := []rune(s)
-	end := start + length
-	if end > len(rs) {
-		end = len(rs)
-	}
+	end := min(start+length, len(rs))
 	return string(rs[start:end])
 }

artifact.go

@@ -23,7 +23,7 @@ func (a *artifactImpl) PathAfterFinished() (string, error) {
 
 func (a *artifactImpl) SaveAs(path string) error {
 	if !a.connection.isRemote {
-		_, err := a.channel.Send("saveAs", map[string]interface{}{
+		_, err := a.channel.Send("saveAs", map[string]any{
 			"path": path,
 		})
 		return err
@@ -63,7 +63,7 @@ func (a *artifactImpl) ReadIntoBuffer() ([]byte, error) {
 	return stream.(*streamImpl).ReadAll()
 }
 
-func newArtifact(parent *channelOwner, objectType string, guid string, initializer map[string]interface{}) *artifactImpl {
+func newArtifact(parent *channelOwner, objectType string, guid string, initializer map[string]any) *artifactImpl {
 	artifact := &artifactImpl{}
 	artifact.createChannelOwner(artifact, parent, objectType, guid, initializer)
 	return artifact

assertions.go

@@ -45,20 +45,20 @@ type expectedTextValue struct {
 }
 
 type frameExpectOptions struct {
-	ExpressionArg  interface{}         `json:"expressionArg,omitempty"`
+	ExpressionArg  any                 `json:"expressionArg,omitempty"`
 	ExpectedText   []expectedTextValue `json:"expectedText,omitempty"`
 	ExpectedNumber *float64            `json:"expectedNumber,omitempty"`
-	ExpectedValue  interface{}         `json:"expectedValue,omitempty"`
+	ExpectedValue  any                 `json:"expectedValue,omitempty"`
 	UseInnerText   *bool               `json:"useInnerText,omitempty"`
 	IsNot          bool                `json:"isNot"`
 	Timeout        *float64            `json:"timeout"`
 }
 
 type frameExpectResult struct {
-	Matches  bool        `json:"matches"`
-	Received interface{} `json:"received,omitempty"`
-	TimedOut *bool       `json:"timedOut,omitempty"`
-	Log      []string    `json:"log,omitempty"`
+	Matches  bool     `json:"matches"`
+	Received any      `json:"received,omitempty"`
+	TimedOut *bool    `json:"timedOut,omitempty"`
+	Log      []string `json:"log,omitempty"`
 }
 
 type assertionsBase struct {
@@ -70,7 +70,7 @@ type assertionsBase struct {
 func (b *assertionsBase) expect(
 	expression string,
 	options frameExpectOptions,
-	expected interface{},
+	expected any,
 	message string,
 ) error {
 	options.IsNot = b.isNot
@@ -101,7 +101,7 @@ func (b *assertionsBase) expect(
 }
 
 func toExpectedTextValues(
-	items []interface{},
+	items []any,
 	matchSubstring bool,
 	normalizeWhiteSpace bool,
 	ignoreCase *bool,
@@ -132,13 +132,13 @@ func toExpectedTextValues(
 	return out, nil
 }
 
-func convertToInterfaceList(v interface{}) []interface{} {
+func convertToInterfaceList(v any) []any {
 	rv := reflect.ValueOf(v)
 	if rv.Kind() != reflect.Slice {
-		return []interface{}{v}
+		return []any{v}
 	}
 
-	list := make([]interface{}, rv.Len())
+	list := make([]any, rv.Len())
 	for i := 0; i < rv.Len(); i++ {
 		list[i] = rv.Index(i).Interface()
 	}

binding_call.go

@@ -23,15 +23,15 @@ type BindingSource struct {
 }
 
 // ExposedFunction represents the func signature of an exposed function
-type ExposedFunction = func(args ...interface{}) interface{}
+type ExposedFunction = func(args ...any) any
 
 // BindingCallFunction represents the func signature of an exposed binding call func
-type BindingCallFunction func(source *BindingSource, args ...interface{}) interface{}
+type BindingCallFunction func(source *BindingSource, args ...any) any
 
 func (b *bindingCallImpl) Call(f BindingCallFunction) {
 	defer func() {
 		if r := recover(); r != nil {
-			if _, err := b.channel.Send("reject", map[string]interface{}{
+			if _, err := b.channel.Send("reject", map[string]any{
 				"error": serializeError(r.(error)),
 			}); err != nil {
 				logger.Error("could not reject BindingCall", "error", err)
@@ -45,31 +45,31 @@ func (b *bindingCallImpl) Call(f BindingCallFunction) {
 		Page:    frame.Page(),
 		Frame:   frame,
 	}
-	var result interface{}
+	var result any
 	if handle, ok := b.initializer["handle"]; ok {
 		result = f(source, fromChannel(handle))
 	} else {
-		initializerArgs := b.initializer["args"].([]interface{})
-		funcArgs := []interface{}{}
-		for i := 0; i < len(initializerArgs); i++ {
+		initializerArgs := b.initializer["args"].([]any)
+		funcArgs := []any{}
+		for i := range initializerArgs {
 			funcArgs = append(funcArgs, parseResult(initializerArgs[i]))
 		}
 		result = f(source, funcArgs...)
 	}
-	_, err := b.channel.Send("resolve", map[string]interface{}{
+	_, err := b.channel.Send("resolve", map[string]any{
 		"result": serializeArgument(result),
 	})
 	if err != nil {
 		logger.Error("could not resolve BindingCall", "error", err)
 	}
 }
 
-func serializeError(err error) map[string]interface{} {
+func serializeError(err error) map[string]any {
 	st := stack.Trace().TrimRuntime()
 	if len(st) == 0 { // https://github.com/go-stack/stack/issues/27
 		st = stack.Trace()
 	}
-	return map[string]interface{}{
+	return map[string]any{
 		"error": &Error{
 			Name:    "Playwright for Go Error",
 			Message: err.Error(),
@@ -80,7 +80,7 @@ func serializeError(err error) map[string]interface{} {
 	}
 }
 
-func newBindingCall(parent *channelOwner, objectType string, guid string, initializer map[string]interface{}) *bindingCallImpl {
+func newBindingCall(parent *channelOwner, objectType string, guid string, initializer map[string]any) *bindingCallImpl {
 	bt := &bindingCallImpl{}
 	bt.createChannelOwner(bt, parent, objectType, guid, initializer)
 	return bt

browser.go

@@ -30,7 +30,7 @@ func (b *browserImpl) IsConnected() bool {
 }
 
 func (b *browserImpl) NewContext(options ...BrowserNewContextOptions) (BrowserContext, error) {
-	overrides := map[string]interface{}{}
+	overrides := map[string]any{}
 	option := BrowserNewContextOptions{}
 	if len(options) == 1 {
 		option = options[0]
@@ -142,7 +142,7 @@ func (b *browserImpl) Close(options ...BrowserCloseOptions) (err error) {
 	if b.shouldCloseConnectionOnClose {
 		err = b.connection.Stop()
 	} else if b.closeReason != nil {
-		_, err = b.channel.Send("close", map[string]interface{}{
+		_, err = b.channel.Send("close", map[string]any{
 			"reason": b.closeReason,
 		})
 	} else {
@@ -159,7 +159,7 @@ func (b *browserImpl) Version() string {
 }
 
 func (b *browserImpl) StartTracing(options ...BrowserStartTracingOptions) error {
-	overrides := map[string]interface{}{}
+	overrides := map[string]any{}
 	option := BrowserStartTracingOptions{}
 	if len(options) == 1 {
 		option = options[0]
@@ -218,7 +218,7 @@ func (b *browserImpl) OnDisconnected(fn func(Browser)) {
 	b.On("disconnected", fn)
 }
 
-func newBrowser(parent *channelOwner, objectType string, guid string, initializer map[string]interface{}) *browserImpl {
+func newBrowser(parent *channelOwner, objectType string, guid string, initializer map[string]any) *browserImpl {
 	b := &browserImpl{
 		isConnected: true,
 		contexts:    make([]BrowserContext, 0),
@@ -230,11 +230,11 @@ func newBrowser(parent *channelOwner, objectType string, guid string, initialize
 	return b
 }
 
-func transformClientCertificate(clientCertificates []ClientCertificate) ([]map[string]interface{}, error) {
-	results := make([]map[string]interface{}, 0)
+func transformClientCertificate(clientCertificates []ClientCertificate) ([]map[string]any, error) {
+	results := make([]map[string]any, 0)
 
 	for _, cert := range clientCertificates {
-		data := map[string]interface{}{
+		data := map[string]any{
 			"origin":     cert.Origin,
 			"passphrase": cert.Passphrase,
 		}