@agoric/eslint-plugin 0.1.1-dev-c5dea1c.0.c5dea1c → 0.1.1-dev-4ea2a82.0.4ea2a82

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/eslint-plugin",
-  "version": "0.1.1-dev-c5dea1c.0.c5dea1c",
+  "version": "0.1.1-dev-4ea2a82.0.4ea2a82",
   "description": "ESLint plugin for Agoric best practices",
   "main": "src/index.js",
   "type": "commonjs",
@@ -24,11 +24,11 @@
   },
   "devDependencies": {
     "eslint": "^9.0.0",
-    "eslint-plugin-eslint-plugin": "^7.2.0"
+    "eslint-plugin-eslint-plugin": "^7.3.2"
   },
   "license": "Apache-2.0",
   "engines": {
     "node": "^20.9 || ^22.11"
   },
-  "gitHead": "c5dea1c874d9ab8a0da0d559d66be9c7d611741f"
+  "gitHead": "4ea2a829ab7a251c14fa872a0c7ac3e85b178eeb"
 }

package/src/index.js

@@ -1,5 +1,5 @@
 const fs = require('node:fs');
-const path = require('path');
+const path = require('node:path');
 
 const pkg = JSON.parse(
   fs.readFileSync(path.join(__dirname, '../package.json'), 'utf8'),

package/src/rules/group-jsdoc-imports.js

@@ -1,7 +1,12 @@
+/**
+ * @import {Bar} from 'foo';
+ * @import {Rule} from 'eslint';
+ */
+
 /**
  * ESLint rule: group-jsdoc-imports
  *
- * Moves inline JSDoc type imports (e.g. \@type {import('foo').Bar})
+ * Moves inline JSDoc type imports (e.g. \@type {Bar})
  * into a top-level JSDoc block with \@import lines, then references the
  * import by name (e.g. \@type {Bar}).
  *
@@ -14,7 +19,7 @@
  *    }
  *  }
  *
- * @type {import('eslint').Rule.RuleModule}
+ * @type {Rule.RuleModule}
  */
 /**
  * ESLint rule: group-jsdoc-imports (one-fix-per-inline-import version)
@@ -270,26 +275,24 @@ module.exports = {
                   `${buildNewBlock(importTypeName, importPath)}\n`,
                 ),
               );
-            } else {
+            } else if (
               // If we do have a block, ensure it includes `@import {typeName} from 'importPath'`
-              if (
-                !alreadyHasImport(
-                  topBlockComment.value,
-                  importTypeName,
-                  importPath,
-                )
-              ) {
-                fixOps.push(
-                  fixer.replaceTextRange(
-                    topBlockComment.range,
-                    appendImportToComment(
-                      topBlockComment,
-                      importTypeName,
-                      importPath,
-                    ),
+              !alreadyHasImport(
+                topBlockComment.value,
+                importTypeName,
+                importPath,
+              )
+            ) {
+              fixOps.push(
+                fixer.replaceTextRange(
+                  topBlockComment.range,
+                  appendImportToComment(
+                    topBlockComment,
+                    importTypeName,
+                    importPath,
                   ),
-                );
-              }
+                ),
+              );
             }
 
             // (b) Remove the inline usage from *this* comment

package/src/rules/no-typedef-import.js

@@ -11,6 +11,10 @@
  * @see https://github.com/microsoft/typescript/issues/60831
  */
 
+/**
+ * @import {Rule} from 'eslint';
+ */
+
 const LINE_REGEX =
   /^(\s*\*?\s*)@typedef\s+\{\s*import\((['"])([^'"]+)\2\)\.([A-Za-z0-9_$]+)([^}]*)\}\s+([A-Za-z0-9_$]+)(.*)$/;
 
@@ -76,7 +80,7 @@ const transformCommentValue = value => {
   return lines.join('\n');
 };
 
-/** @type {import('eslint').Rule.RuleModule} */
+/** @type {Rule.RuleModule} */
 module.exports = {
   meta: {
     type: 'problem',