Documenting AMD + Angularjs code Follow

In light of version 5 I am still having issues documenting code which is more nested.

Code: https://gist.github.com/3668602

Now my structure hierarchy is showing:

m: getName():string
v: define
c: mainservice
     ->m: getName

Just as so. I'm looking to create a structure that doesn't have a global file function (ie the first m ) and also including the type in the nested function to have something like so:

v: define
c: mainservice
     ->m: getName():string

Attempts:

"@methodof mainservice" or "@method" in place of @name shows:

m: getName():string
v: define
c: mainservice

I've tried a few other things outside the function doc to include adding @constructor (which I ultimately don't want to do with @class as this bugs out jsdoc compiler)

My ultimate goal is to have jsdoc3 able to compile it and have webstorm 5 still contain proper structures. If this is a bug, i'll gladly file the issue
-Thanks