object{,/type}: Fix up API shape v0.1.142

10 files changed, 16 insertions, 17 deletions

diff --git a/object/fetch/object_parse.go b/object/fetch/object_parse.go
index a29e17c0..35389ddf 100644
--- a/object/fetch/object_parse.go
+++ b/object/fetch/object_parse.go
@@ -5,7 +5,6 @@ import (
 
 	"codeberg.org/lindenii/furgit/object"
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
 func (r *Fetcher) parseObject(id objectid.ObjectID) (object.Object, error) {
@@ -14,9 +13,9 @@ func (r *Fetcher) parseObject(id objectid.ObjectID) (object.Object, error) {
 		return nil, err
 	}
 
-	parsed, err := object.ParseObjectWithoutHeader(ty, content, id.Algorithm())
+	parsed, err := object.ParseWithoutHeader(ty, content, id.Algorithm())
 	if err != nil {
-		tyName, ok := objecttype.Name(ty)
+		tyName, ok := ty.Name()
 		if !ok {
 			tyName = fmt.Sprintf("type %d", ty)
 		}
diff --git a/object/header/append.go b/object/header/append.go
index 8c0d928c..6d824740 100644
--- a/object/header/append.go
+++ b/object/header/append.go
@@ -12,7 +12,7 @@ func Append(dst []byte, ty objecttype.Type, size int64) ([]byte, bool) {
 		return nil, false
 	}
 
-	tyName, ok := objecttype.Name(ty)
+	tyName, ok := ty.Name()
 	if !ok {
 		return nil, false
 	}
diff --git a/object/header/parse.go b/object/header/parse.go
index 61678baf..cad521e5 100644
--- a/object/header/parse.go
+++ b/object/header/parse.go
@@ -23,7 +23,7 @@ func Parse(data []byte) (objecttype.Type, int64, int, bool) {
 
 	nul := space + 1 + nulRel
 
-	ty, ok := objecttype.ParseName(string(data[:space]))
+	ty, ok := objecttype.Parse(string(data[:space]))
 	if !ok {
 		return objecttype.TypeInvalid, 0, 0, false
 	}
diff --git a/object/parse_with_header.go b/object/parse_with_header.go
index b2ddfff4..9bcf5a4c 100644
--- a/object/parse_with_header.go
+++ b/object/parse_with_header.go
@@ -7,10 +7,10 @@ import (
 	objectid "codeberg.org/lindenii/furgit/object/id"
 )
 
-// ParseObjectWithHeader parses a loose object in "type size\x00body" format.
+// ParseWithHeader parses a loose object in "type size\x00body" format.
 //
 //nolint:ireturn
-func ParseObjectWithHeader(raw []byte, algo objectid.Algorithm) (Object, error) {
+func ParseWithHeader(raw []byte, algo objectid.Algorithm) (Object, error) {
 	ty, size, headerLen, ok := objectheader.Parse(raw)
 	if !ok {
 		return nil, fmt.Errorf("object: malformed object header")
@@ -21,5 +21,5 @@ func ParseObjectWithHeader(raw []byte, algo objectid.Algorithm) (Object, error)
 		return nil, fmt.Errorf("object: size mismatch: header says %d bytes, body has %d", size, len(body))
 	}
 
-	return ParseObjectWithoutHeader(ty, body, algo)
+	return ParseWithoutHeader(ty, body, algo)
 }
diff --git a/object/parse_without_header.go b/object/parse_without_header.go
index d8774b9a..c889cb40 100644
--- a/object/parse_without_header.go
+++ b/object/parse_without_header.go
@@ -11,10 +11,10 @@ import (
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
-// ParseObjectWithoutHeader parses a typed object body.
+// ParseWithoutHeader parses a typed object body.
 //
 //nolint:ireturn
-func ParseObjectWithoutHeader(ty objecttype.Type, body []byte, algo objectid.Algorithm) (Object, error) {
+func ParseWithoutHeader(ty objecttype.Type, body []byte, algo objectid.Algorithm) (Object, error) {
 	switch ty {
 	case objecttype.TypeBlob:
 		return blob.Parse(body)
diff --git a/object/store/loose/helpers_test.go b/object/store/loose/helpers_test.go
index e69c7e7a..97cec9d7 100644
--- a/object/store/loose/helpers_test.go
+++ b/object/store/loose/helpers_test.go
@@ -48,7 +48,7 @@ func expectedRawObject(t *testing.T, testRepo *testgit.TestRepo, id objectid.Obj
 
 	typeName := testRepo.Run(t, "cat-file", "-t", id.String())
 
-	ty, ok := objecttype.ParseName(typeName)
+	ty, ok := objecttype.Parse(typeName)
 	if !ok {
 		t.Fatalf("ParseName(%q) failed", typeName)
 	}
diff --git a/object/store/packed/helpers_test.go b/object/store/packed/helpers_test.go
index 2125185d..dc02e316 100644
--- a/object/store/packed/helpers_test.go
+++ b/object/store/packed/helpers_test.go
@@ -50,7 +50,7 @@ func expectedRawObject(t *testing.T, testRepo *testgit.TestRepo, id objectid.Obj
 
 	typeName := testRepo.Run(t, "cat-file", "-t", id.String())
 
-	ty, ok := objecttype.ParseName(typeName)
+	ty, ok := objecttype.Parse(typeName)
 	if !ok {
 		t.Fatalf("ParseName(%q) failed", typeName)
 	}
diff --git a/object/tag/parse.go b/object/tag/parse.go
index f24d5965..92fa0d8b 100644
--- a/object/tag/parse.go
+++ b/object/tag/parse.go
@@ -45,7 +45,7 @@ func Parse(body []byte, algo objectid.Algorithm) (*Tag, error) {
 			t.Target = id
 			haveTarget = true
 		case "type":
-			ty, ok := objecttype.ParseName(string(value))
+			ty, ok := objecttype.Parse(string(value))
 			if !ok {
 				return nil, errors.New("object: tag: unknown target type")
 			}
diff --git a/object/tag/serialize.go b/object/tag/serialize.go
index 758cee39..4f9d6664 100644
--- a/object/tag/serialize.go
+++ b/object/tag/serialize.go
@@ -18,7 +18,7 @@ func (tag *Tag) SerializeWithoutHeader() ([]byte, error) {
 	var buf bytes.Buffer
 	fmt.Fprintf(&buf, "object %s\n", tag.Target.String())
 
-	tyName, ok := objecttype.Name(tag.TargetType)
+	tyName, ok := tag.TargetType.Name()
 	if !ok {
 		return nil, fmt.Errorf("object: tag: invalid target type %d", tag.TargetType)
 	}
diff --git a/object/type/name.go b/object/type/name.go
index 870ac1e4..d5636be9 100644
--- a/object/type/name.go
+++ b/object/type/name.go
@@ -7,8 +7,8 @@ const (
 	typeNameTag    = "tag"
 )
 
-// ParseName parses a canonical Git object type name.
-func ParseName(name string) (Type, bool) {
+// Parse parses a canonical Git object type name.
+func Parse(name string) (Type, bool) {
 	switch name {
 	case typeNameBlob:
 		return TypeBlob, true
@@ -24,7 +24,7 @@ func ParseName(name string) (Type, bool) {
 }
 
 // Name returns the canonical Git object type name.
-func Name(ty Type) (string, bool) {
+func (ty Type) Name() (string, bool) {
 	switch ty {
 	case TypeBlob:
 		return typeNameBlob, true