Remove member accessors from link keys

Author: Daniel-Knights

index.js

@@ -593,11 +593,15 @@ exports.astNodeVisitor = {
             replace(typeRegex);
 
             const linkWithoutTextRegex = new RegExp(
-              `@(link (?!https?))${key}((?:\\.[^\\s\\}]*)*\\s*\\})`,
+              `@(link (?!https?:))${key}((?:\\.[^\\s}]*)*\\s*\\})`,
+              'g',
+            );
+            const linkMemberAccessorRegex = new RegExp(
+              `@(link (?!https?:)${key})(?:\\.[^\\s}]*)*([\\s|][^}]*\\})`,
               'g',
             );
             const linkWithTextRegex = new RegExp(
-              `@(link (?!https?))${key}((?:\\.[^\\s\\}]*)*(?:\\s|\\s*\\|)[^\\}]*\\})`,
+              `@(link (?!https?:))${key}([\\s|][^}]*\\})`,
               'g',
             );
 
@@ -606,6 +610,11 @@ exports.astNodeVisitor = {
               linkWithoutTextRegex,
               `@$1${key} ${key}$2`,
             );
+            // Remove member accessors from link key
+            comment.value = comment.value.replace(
+              linkMemberAccessorRegex,
+              '@$1$2',
+            );
 
             replace(linkWithTextRegex);
 

test/dest/expected.json

@@ -833,6 +833,98 @@
     "memberof": "module:test",
     "params": []
   },
+  {
+    "comment": "/**\n * {@link module:test/sub/NumberStore~NumberStore NumberStore.getNumber}\n */",
+    "meta": {
+      "range": [
+        1576,
+        1626
+      ],
+      "filename": "index.js",
+      "lineno": 77,
+      "columnno": 0,
+      "code": {
+        "name": "exports.LinkWithMemberAccessor",
+        "type": "VariableDeclaration"
+      }
+    },
+    "description": "{@link module:test/sub/NumberStore~NumberStore NumberStore.getNumber}",
+    "name": "LinkWithMemberAccessor",
+    "longname": "module:test.LinkWithMemberAccessor",
+    "kind": "constant",
+    "memberof": "module:test",
+    "scope": "static"
+  },
+  {
+    "comment": "",
+    "meta": {
+      "range": [
+        1589,
+        1625
+      ],
+      "filename": "index.js",
+      "lineno": 77,
+      "columnno": 13,
+      "code": {
+        "name": "LinkWithMemberAccessor",
+        "type": "Identifier",
+        "value": "NumberStore"
+      }
+    },
+    "undocumented": true,
+    "name": "LinkWithMemberAccessor",
+    "longname": "module:test~LinkWithMemberAccessor",
+    "kind": "constant",
+    "scope": "inner",
+    "memberof": "module:test",
+    "params": []
+  },
+  {
+    "comment": "/**\n * {@link module:test/sub/NumberStore~NumberStore Num}\n */",
+    "meta": {
+      "range": [
+        1673,
+        1730
+      ],
+      "filename": "index.js",
+      "lineno": 82,
+      "columnno": 0,
+      "code": {
+        "name": "exports.LinkWithMemberAccessorAndText",
+        "type": "VariableDeclaration"
+      }
+    },
+    "description": "{@link module:test/sub/NumberStore~NumberStore Num}",
+    "name": "LinkWithMemberAccessorAndText",
+    "longname": "module:test.LinkWithMemberAccessorAndText",
+    "kind": "constant",
+    "memberof": "module:test",
+    "scope": "static"
+  },
+  {
+    "comment": "",
+    "meta": {
+      "range": [
+        1686,
+        1729
+      ],
+      "filename": "index.js",
+      "lineno": 82,
+      "columnno": 13,
+      "code": {
+        "name": "LinkWithMemberAccessorAndText",
+        "type": "Identifier",
+        "value": "NumberStore"
+      }
+    },
+    "undocumented": true,
+    "name": "LinkWithMemberAccessorAndText",
+    "longname": "module:test~LinkWithMemberAccessorAndText",
+    "kind": "constant",
+    "scope": "inner",
+    "memberof": "module:test",
+    "params": []
+  },
   {
     "comment": "/** @ignore */",
     "meta": {

test/src/index.js

@@ -70,3 +70,13 @@ export const Link = NumberStore;
  * {@link NumberStore Num}
  */
 export const LinkWithText = NumberStore;
+
+/**
+ * {@link NumberStore.getNumber}
+ */
+export const LinkWithMemberAccessor = NumberStore;
+
+/**
+ * {@link NumberStore.getNumber Num}
+ */
+export const LinkWithMemberAccessorAndText = NumberStore;