a/activitypub
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Make the To[Objects] and On[Objects] generic functions work

Browse source 
They lose functionality as opposed to the more specific ones because we can't check for it being an ItemCollection
This commit is contained in:
mariusor 2022-06-03 09:23:48 +02:00
parent 495ce2ea66
commit b7c961002d
No known key found for this signature in database
GPG key ID: DBF5E47F5DBC4D21
2 changed files with 25 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
helpers.go
View file

@ -40,27 +40,6 @@ type WithOrderedCollectionPageFn func(*OrderedCollectionPage) error
// WithItemCollectionFn represents a function type that can be used as a parameter for OnItemCollection helper function
type WithItemCollectionFn func(*ItemCollection) error
/*
func To[T Objects](it Item) (*T, error) {
ob, ok := it.(T)
if !ok {
return nil, errors.New("Invalid cast to %T for object %T", T, it)
}
return &ob, nil
}
func On[T Objects](it Item, fn func(ob *T)) error {
if IsNil(it) {
return nil
}
ob, err := To[T](it)
if err != nil {
return err
}
return fn(ob)
}
*/
// OnLink calls function fn on it Item if it can be asserted to type *Link
//
// This function should be safe to use for all types with a structure compatible
@ -76,71 +55,20 @@ func OnLink(it LinkOrIRI, fn WithLinkFn) error {
return fn(ob)
}
func To[T Objects](it Item) (*T, error) {
ob, ok := it.(T)
if !ok {
return nil, fmt.Errorf("invalid cast for object %T", it)
}
return &ob, nil
}
func On[T Objects](it Item, fn func(*T) error) error {
/*
switch i := it.(type) {
case *Object:
return fn(i)
case Object:
return fn(&i)
case *Place:
return fn(i)
case Place:
return fn(&i)
case *Profile:
return fn(i)
case Profile:
return fn(&i)
case *Relationship:
return fn(i)
case Relationship:
return fn(&i)
case *Tombstone:
return fn(i)
case Tombstone:
return fn(&i)
case *Actor:
return fn(i)
case Actor:
return fn(&i)
case *Activity:
return fn(i)
case Activity:
return fn(&i)
case *IntransitiveActivity:
return fn(i)
case IntransitiveActivity:
return fn(&i)
case *Question:
return fn(i)
case Question:
return fn(&i)
case *Collection:
return fn(i)
case Collection:
return fn(&i)
case *CollectionPage:
return fn(i)
case CollectionPage:
return fn(&i)
case *OrderedCollection:
return fn(i)
case OrderedCollection:
return fn(&i)
case *OrderedCollectionPage:
return fn(i)
case OrderedCollectionPage:
return fn(&i)
default:
typ := reflect.TypeOf(new(Object))
if reflect.TypeOf(it).ConvertibleTo(typ) {
if i, ok := reflect.ValueOf(it).Convert(typ).Interface().(*Object); ok {
return fn(i)
}
}
}
*/
return fmt.Errorf("invalid type %T for generic function", it)
ob, err := To[T](it)
if err != nil {
return err
}
return fn(ob)
}
// OnObject calls function fn on it Item if it can be asserted to type *Object

19
helpers_test.go
View file

@ -271,7 +271,7 @@ func TestOnOrderedCollectionPage(t *testing.T) {
type args[T Objects] struct {
it T
fn func (fn canErrorFunc, expected T) func(*T) error
fn func(fn canErrorFunc, expected T) func(*T) error
}
type testPair[T Objects] struct {
@ -291,13 +291,18 @@ func assert[T Objects](fn canErrorFunc, expected T) func(*T) error {
}
func TestOn(t *testing.T) {
testQuestion := Object{ID: "https://example.com"}
var tests []testPair[Object] = []testPair[Object]{
var tests = []testPair[Object]{
{
name: "single",
args: args[Object]{testQuestion, assert[Object]},
expected: testQuestion,
wantErr: true,
name: "single object",
args: args[Object]{Object{ID: "https://example.com"}, assert[Object]},
expected: Object{ID: "https://example.com"},
wantErr: false,
},
{
name: "single image",
args: args[Image]{Image{ID: "http://example.com"}, assert[Image]},
expected: Image{ID: "http://example.com"},
wantErr: false,
},
}
for _, tt := range tests {