fix: return the shortest, completely resolved path in the resolve command

fixes #5703

License: MIT
Signed-off-by: Steven Allen <[email protected]>

Author: Stebalien

core/commands/resolve.go

@@ -135,9 +135,8 @@ Resolve the value of an IPFS DAG path:
 			return err
 		}
 
-		c := rp.Cid()
-
-		return cmds.EmitOnce(res, &ncmd.ResolvedPath{Path: path.FromCid(c)})
+		rp = coreiface.Simplify(rp)
+		return cmds.EmitOnce(res, &ncmd.ResolvedPath{Path: path.Path(rp)})
 	},
 	Encoders: cmds.EncoderMap{
 		cmds.Text: cmds.MakeEncoder(func(req *cmds.Request, w io.Writer, v interface{}) error {

core/coreapi/interface/path.go

@@ -125,6 +125,22 @@ func IpldPath(c cid.Cid) ResolvedPath {
 	}
 }
 
+// Simplify takes a ResolvedPath and returns a *new* ResovledPath that's as
+// short as possible. In the new resolved path, `p.Cid()` will be the same as
+// `p.Root()`.
+func Simplify(p ResolvedPath) ResolvedPath {
+	c := p.Cid()
+	if c == p.Root() {
+		return p
+	}
+	simplified := "/" + p.Namespace() + "/" + c.String()
+	remainder := p.Remainder()
+	if remainder != "" {
+		simplified += "/" + remainder
+	}
+	return NewResolvedPath(ipfspath.Path(simplified), c, c, remainder)
+}
+
 // ParsePath parses string path to a Path
 func ParsePath(p string) (Path, error) {
 	pp, err := ipfspath.ParsePath(p)

test/sharness/t0160-resolve.sh

@@ -14,6 +14,10 @@ test_expect_success "resolve: prepare files" '
   c_hash=$(ipfs add -q -r a/b/c | tail -n1)
 '
 
+test_expect_success "resolve: prepare dag" '
+  dag_hash=$(ipfs dag put <<<"{\"a\": {\"b\": {\"c\": \"asdfasdfasdf\"}}}")
+'
+
 test_resolve_setup_name() {
   ref=$1
 
@@ -58,6 +62,8 @@ test_resolve_cmd() {
   test_resolve "/ipfs/$a_hash/b" "/ipfs/$b_hash"
   test_resolve "/ipfs/$a_hash/b/c" "/ipfs/$c_hash"
   test_resolve "/ipfs/$b_hash/c" "/ipfs/$c_hash"
+  test_resolve "/ipld/$dag_hash/a/b/c" "/ipld/$dag_hash/a/b/c"
+  test_resolve "/ipld/$dag_hash/a/b" "/ipld/$dag_hash/a/b"
 
   test_resolve_setup_name "/ipfs/$a_hash"
   test_resolve "/ipns/$id_hash" "/ipfs/$a_hash"