package.json

@@ -24,6 +24,7 @@
     "@babel/plugin-transform-flow-strip-types": "^7.16.7",
     "@babel/preset-env": "^7.16.11",
     "@babel/register": "^7.17.7",
+    "@es-joy/jsdoc-eslint-parser": "^0.8.2",
     "@hkdobrev/run-if-changed": "^0.3.1",
     "@typescript-eslint/parser": "^5.17.0",
     "babel-plugin-add-module-exports": "^1.0.4",

src/iterateJsdoc.js

@@ -1271,7 +1271,6 @@ export default function iterateJsdoc (iterator, ruleConfig) {
 
       const checkJsdoc = (info, handler, node) => {
         const jsdocNode = getJSDocComment(sourceCode, node, settings);
-
         if (!jsdocNode) {
           return;
         }

src/rules/checkParamNames.js

@@ -10,7 +10,6 @@ import iterateJsdoc from '../iterateJsdoc';
  * @param {boolean} enableFixer
  * @param {Array<string>} functionParameterNames
  * @param jsdoc
- * @param _jsdocNode
  * @param utils
  * @param report
  * @returns {boolean}
@@ -23,7 +22,7 @@ const validateParameterNames = (
   checkTypesRegex,
   disableExtraPropertyReporting,
   enableFixer,
-  functionParameterNames, jsdoc, _jsdocNode, utils, report,
+  functionParameterNames, jsdoc, utils, report,
 ) => {
   const paramTags = Object.entries(jsdoc.tags).filter(([
     , tag,
@@ -297,7 +296,6 @@ const validateParameterNamesDeep = (
 export default iterateJsdoc(({
   context,
   jsdoc,
-  jsdocNode,
   report,
   utils,
 }) => {
@@ -332,7 +330,6 @@ export default iterateJsdoc(({
     enableFixer,
     functionParameterNames,
     jsdoc,
-    jsdocNode,
     utils,
     report,
   );

src/rules/checkPropertyNames.js

@@ -4,14 +4,13 @@ import iterateJsdoc from '../iterateJsdoc';
  * @param {string} targetTagName
  * @param {boolean} enableFixer
  * @param jsdoc
- * @param jsdocNode
  * @param utils
  * @returns {boolean}
  */
 const validatePropertyNames = (
   targetTagName,
   enableFixer,
-  jsdoc, jsdocNode, utils,
+  jsdoc, utils,
 ) => {
   const propertyTags = Object.entries(jsdoc.tags).filter(([
     , tag,
@@ -95,7 +94,6 @@ const validatePropertyNamesDeep = (
 export default iterateJsdoc(({
   context,
   jsdoc,
-  jsdocNode,
   report,
   utils,
 }) => {
@@ -114,7 +112,6 @@ export default iterateJsdoc(({
     targetTagName,
     enableFixer,
     jsdoc,
-    jsdocNode,
     utils,
   );
 

src/rules/noMissingSyntax.js

@@ -25,6 +25,7 @@ export default iterateJsdoc(({
   info: {
     comment,
   },
+  sourceCode,
   state,
 }) => {
   if (!context.options[0]) {
@@ -38,8 +39,12 @@ export default iterateJsdoc(({
 
   const foundContext = contexts.find((cntxt) => {
     return typeof cntxt === 'string' ?
-      esquery.matches(node, esquery.parse(cntxt)) :
-      (!cntxt.context || cntxt.context === 'any' || esquery.matches(node, esquery.parse(cntxt.context))) &&
+      esquery.matches(node, esquery.parse(cntxt), null, {
+        visitorKeys: sourceCode.visitorKeys,
+      }) :
+      (!cntxt.context || cntxt.context === 'any' || esquery.matches(node, esquery.parse(cntxt.context), null, {
+        visitorKeys: sourceCode.visitorKeys,
+      })) &&
         comment === cntxt.comment;
   });
 

src/rules/noRestrictedSyntax.js

@@ -7,6 +7,7 @@ export default iterateJsdoc(({
   info: {
     comment,
   },
+  sourceCode,
   report,
 }) => {
   if (!context.options.length) {
@@ -21,8 +22,12 @@ export default iterateJsdoc(({
 
   const foundContext = contexts.find((cntxt) => {
     return typeof cntxt === 'string' ?
-      esquery.matches(node, esquery.parse(cntxt)) :
-      (!cntxt.context || cntxt.context === 'any' || esquery.matches(node, esquery.parse(cntxt.context))) &&
+      esquery.matches(node, esquery.parse(cntxt), null, {
+        visitorKeys: sourceCode.visitorKeys,
+      }) :
+      (!cntxt.context || cntxt.context === 'any' || esquery.matches(node, esquery.parse(cntxt.context), null, {
+        visitorKeys: sourceCode.visitorKeys,
+      })) &&
         comment === cntxt.comment;
   });
 

test/rules/assertions/noRestrictedSyntax.js

@@ -347,6 +347,31 @@ export default {
         },
       ],
     },
+    {
+      code: `
+        class a {
+          /** */
+          private b () {}
+        }
+      `,
+      errors: [
+        {
+          line: 3,
+          message: 'Syntax is restricted: MethodDefinition:not([accessibility="public"]):has(JsdocBlock)',
+        },
+      ],
+      ignoreReadme: true,
+      options: [
+        {
+          contexts: [
+            {
+              context: 'MethodDefinition:not([accessibility="public"]):has(JsdocBlock)',
+            },
+          ],
+        },
+      ],
+      parser: require.resolve('@es-joy/jsdoc-eslint-parser/typescript'),
+    },
   ],
   valid: [
     {