refactor: IPLD map type

Author: alanshaw

ipld/datamodel/map.go

@@ -249,5 +249,5 @@ func (m *Map) UnmarshalDagJSON(r io.Reader) (err error) {
 	return nil
 }
 
-var _ ipld.Map[string, ipld.Any] = (*Map)(nil)
-var _ ipld.MutableMap[string, ipld.Any] = (*Map)(nil)
+var _ ipld.Map = (*Map)(nil)
+var _ ipld.MutableMap = (*Map)(nil)

ipld/ipld.go

@@ -19,23 +19,24 @@ import (
 //   - Link ([cid.Cid])
 type Any = any
 
-// Map is an IPLD map that supports any of the IPLD types for keys/values.
-type Map[K, V Any] interface {
+// Map is an IPLD map that supports any of the IPLD types for values. Keys MUST
+// be strings.
+type Map interface {
 	// All is an iterator over all the key/value pairs in this map.
-	All() iter.Seq2[K, V]
+	All() iter.Seq2[string, Any]
 	// Get a value for the given key. It returns false if the key does not exist
 	// in the map.
-	Get(k K) (V, bool)
+	Get(k string) (Any, bool)
 	// Keys is an iterator over the keys in this map.
-	Keys() iter.Seq[K]
+	Keys() iter.Seq[string]
 	// Values is an iterator over the values in this map.
-	Values() iter.Seq[V]
+	Values() iter.Seq[Any]
 }
 
 // MutableMap is a [Map] that supports changes.
-type MutableMap[K, V Any] interface {
+type MutableMap interface {
 	// Set a value for the given key.
-	Set(k K, v V)
+	Set(k string, v Any)
 }
 
 // Block is content addressed and encoded IPLD data.

testutil/args.go

@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func RandomArgs(t *testing.T) ipld.Map[string, any] {
+func RandomArgs(t *testing.T) ipld.Map {
 	var list []string
 	for range RandomBytes(t, 1)[0] {
 		list = append(list, RandomCID(t).String())

ucan/delegation/delegation.go

@@ -73,7 +73,7 @@ func (d *Delegation) Link() cid.Cid {
 // A map of arbitrary metadata, facts, and proofs of knowledge.
 //
 // https://github.com/ucan-wg/spec/blob/main/README.md#metadata
-func (d *Delegation) Metadata() ipld.Map[string, ipld.Any] {
+func (d *Delegation) Metadata() ipld.Map {
 	if d.model.SigPayload.TokenPayload1_0_0_rc1.Meta == nil {
 		return nil
 	}

ucan/delegation/options.go

@@ -18,7 +18,7 @@ type delegationConfig struct {
 	noexp     bool
 	nnc       []byte
 	nonnc     bool
-	meta      ipld.Map[string, ipld.Any]
+	meta      ipld.Map
 	pol       policy.Policy
 }
 
@@ -96,7 +96,7 @@ func WithNotBefore(nbf ucan.UTCUnixTimestamp) Option {
 }
 
 // WithMetadata configures the arbitrary metadata for the UCAN.
-func WithMetadata(meta ipld.Map[string, ipld.Any]) Option {
+func WithMetadata(meta ipld.Map) Option {
 	return func(cfg *delegationConfig) error {
 		cfg.meta = meta
 		return nil

ucan/delegation/policy/selector/selector.go

@@ -206,7 +206,7 @@ func resolve(sel Selector, subject any, at []string) (any, []any, error) {
 					}
 				}
 				return nil, many, nil
-			} else if m, ok := cur.(ipld.Map[string, any]); ok {
+			} else if m, ok := cur.(ipld.Map); ok {
 				var many []any
 				for k := range m.Keys() {
 					v, _ := m.Get(k)
@@ -229,7 +229,7 @@ func resolve(sel Selector, subject any, at []string) (any, []any, error) {
 			}
 		} else if seg.Field != "" {
 			at = append(at, seg.Field)
-			if m, ok := cur.(ipld.Map[string, ipld.Any]); ok {
+			if m, ok := cur.(ipld.Map); ok {
 				v, ok := m.Get(seg.Field)
 				if !ok && !seg.Optional {
 					return nil, nil, NewResolutionError(fmt.Sprintf("object has no field named: %s", seg.Field), at)

ucan/delegation/policy/selector/selector_test.go

@@ -305,7 +305,7 @@ func TestSelect(t *testing.T) {
 		require.NotEmpty(t, one)
 		require.Empty(t, many)
 
-		user, ok := one.(ipld.Map[string, any])
+		user, ok := one.(ipld.Map)
 		require.True(t, ok)
 		require.Equal(t, alice, user)
 	})

ucan/invocation/arguments.go

@@ -36,7 +36,7 @@ func (n NoArguments) Values() iter.Seq[ipld.Any] {
 	return func(func(ipld.Any) bool) {}
 }
 
-var _ ipld.Map[string, ipld.Any] = (*NoArguments)(nil)
+var _ ipld.Map = (*NoArguments)(nil)
 var _ dagcbor.CBORMarshalable = (*NoArguments)(nil)
 
 // UnknownArguments can be used when the arguments for an invocation cannot be

ucan/invocation/invocation.go

@@ -37,7 +37,7 @@ type Invocation struct {
 // Parameters expected by the command.
 //
 // https://github.com/ucan-wg/invocation/blob/main/README.md#arguments
-func (inv *Invocation) Arguments() ipld.Map[string, ipld.Any] {
+func (inv *Invocation) Arguments() ipld.Map {
 	if inv.model.SigPayload.TokenPayload1_0_0_rc1.Args == nil {
 		return datamodel.NewMap()
 	}
@@ -105,7 +105,7 @@ func (inv *Invocation) Link() cid.Cid {
 // Arbitrary metadata or extensible fields.
 //
 // https://github.com/ucan-wg/invocation/blob/main/README.md#metadata
-func (inv *Invocation) Metadata() ipld.Map[string, ipld.Any] {
+func (inv *Invocation) Metadata() ipld.Map {
 	if inv.model.SigPayload.TokenPayload1_0_0_rc1.Meta == nil {
 		return nil
 	}
@@ -266,7 +266,7 @@ func Invoke(
 	issuer ucan.Signer,
 	subject ucan.Subject,
 	command ucan.Command,
-	arguments ipld.Map[string, ipld.Any],
+	arguments ipld.Map,
 	options ...Option,
 ) (*Invocation, error) {
 	cfg := invocationConfig{}

ucan/invocation/options.go

@@ -16,7 +16,7 @@ type invocationConfig struct {
 	noexp bool
 	nnc   []byte
 	nonnc bool
-	meta  ipld.Map[string, ipld.Any]
+	meta  ipld.Map
 	prf   []cid.Cid
 	iat   *ucan.UTCUnixTimestamp
 	cause *cid.Cid
@@ -65,7 +65,7 @@ func WithNoNonce() Option {
 }
 
 // WithMetadata configures the arbitrary metadata for the UCAN.
-func WithMetadata(meta ipld.Map[string, ipld.Any]) Option {
+func WithMetadata(meta ipld.Map) Option {
 	return func(cfg *invocationConfig) {
 		cfg.meta = meta
 	}