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

@@ -134,13 +134,7 @@ Resolve the value of an IPFS DAG path:
 			return err
 		}
 
-		if rp.Remainder() != "" {
-			// TODO: js expects this error. Instead of fixing this
-			// error, we should fix #5703.
-			return fmt.Errorf("found non-link at given path")
-		}
-
-		return cmds.EmitOnce(res, &ncmd.ResolvedPath{Path: path.Path("/" + rp.Namespace() + "/" + rp.Cid().String())})
+		return cmds.EmitOnce(res, &ncmd.ResolvedPath{Path: path.Path(rp.Simplify().String())})
 	},
 	Encoders: cmds.EncoderMap{
 		cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, rp *ncmd.ResolvedPath) error {

core/coreapi/interface/path.go

@@ -89,6 +89,9 @@ type ResolvedPath interface {
 	// For more examples see the documentation of Cid() method
 	Remainder() string
 
+	// Simplify fully reduces the path to one that traverses no links.
+	Simplify() ResolvedPath
+
 	Path
 }
 
@@ -174,3 +177,16 @@ func (p *resolvedPath) Root() cid.Cid {
 func (p *resolvedPath) Remainder() string {
 	return p.remainder
 }
+
+func (p *resolvedPath) Simplify() ResolvedPath {
+	if p.cid.Equals(p.root) {
+		return p
+	}
+
+	simplified := "/" + p.Namespace() + "/" + p.cid.String()
+	if p.remainder != "" {
+		simplified += "/" + p.remainder
+	}
+
+	return NewResolvedPath(ipfspath.Path(simplified), p.cid, p.cid, p.remainder)
+}

test/sharness/t0160-resolve.sh

@@ -62,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"