merge indexed_db CursorValue and CursorWithValue

Makefile

@@ -2,6 +2,6 @@
 deps\:test:
 	go install github.com/agnivade/wasmbrowsertest@latest
 
-.PHONY: test\:js
+.PHONY: test
 test:
 	GOOS=js GOARCH=wasm go test -timeout 30s -exec wasmbrowsertest ./...

indexed_db/cursor.go

@@ -105,19 +105,9 @@ func (c CursorValue) Update(value any) RequestValue[js.Value] {
 	return RequestValue[js.Value](res)
 }
 
-// CursorWithValue is an instance of IDBCursorWithValue
-//
-// https://developer.mozilla.org/en-US/docs/Web/API/IDBCursorWithValue
-type CursorWithValue CursorValue
-
 // Value returns the IDBCursorWithValue value property.
 //
 // https://developer.mozilla.org/en-US/docs/Web/API/IDBCursorWithValue/value
-func (c CursorWithValue) Value() js.Value {
+func (c CursorValue) Value() js.Value {
 	return js.Value(c).Get("value")
 }
-
-// Cursor returns the IDBCursor.
-func (c CursorWithValue) Cursor() CursorValue {
-	return CursorValue(c)
-}

indexed_db/cursor_test.go

@@ -37,14 +37,13 @@ func TestCursor(t *testing.T) {
 	require.NoError(t, err)
 
 	var cursorWait sync.WaitGroup
-	var cursorReq RequestValue[CursorWithValue]
+	var cursorReq RequestValue[CursorValue]
 	cursorSuccess := goji.EventListener(func(event goji.EventValue) {
 		value := cursorReq.Result()
 		if !js.Value(value).IsNull() {
-			value.Cursor().Continue()
+			value.Continue()
 		}
 		cursorWait.Done()
-
 	})
 	defer cursorSuccess.Release()
 

indexed_db/index.go

@@ -90,9 +90,9 @@ func (i IndexValue) GetKey(key any) RequestValue[js.Value] {
 // OpenCursor wraps the IDBIndex openCursor instance method.
 //
 // https://developer.mozilla.org/en-US/docs/Web/API/IDBIndex/openCursor
-func (i IndexValue) OpenCursor(args ...any) RequestValue[CursorWithValue] {
+func (i IndexValue) OpenCursor(args ...any) RequestValue[CursorValue] {
 	res := js.Value(i).Call("openCursor", args...)
-	return RequestValue[CursorWithValue](res)
+	return RequestValue[CursorValue](res)
 }
 
 // OpenKeyCursor wraps the IDBIndex openKeyCursor instance method.

indexed_db/object_store.go

@@ -146,9 +146,9 @@ func (o ObjectStoreValue) Index(name string) IndexValue {
 // OpenCursor wraps the IDBObjectStore openCursor instance method.
 //
 // https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore/openCursor
-func (o ObjectStoreValue) OpenCursor(args ...any) RequestValue[CursorWithValue] {
+func (o ObjectStoreValue) OpenCursor(args ...any) RequestValue[CursorValue] {
 	res := js.Value(o).Call("openCursor", args...)
-	return RequestValue[CursorWithValue](res)
+	return RequestValue[CursorValue](res)
 }
 
 // OpenKeyCursor wraps the IDBObjectStore openKeyCursor instance method.

indexed_db/request.go

@@ -20,7 +20,7 @@ const (
 
 // RequestResult is the type union for request results.
 type RequestResult interface {
-	js.Value | DatabaseValue | CursorValue | CursorWithValue
+	js.Value | DatabaseValue | CursorValue
 }
 
 // RequestValue is an instance of IDBRequest.