eslint-plugin-kirklin 1.0.0 → 1.1.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Kirk Lin
+Copyright (c) 2023-PRESENT Kirk Lin <https://github.com/kirklin>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -2,6 +2,10 @@
 
 [![npm version][npm-version-src]][npm-version-href]
 [![npm downloads][npm-downloads-src]][npm-downloads-href]
+[![bundle][bundle-src]][bundle-href]
+[![JSDocs][jsdocs-src]][jsdocs-href]
+[![License][license-src]][license-href]
+[![javascript_code style][code-style-image]][code-style-url]
 
 Kirklin extended ESLint rules. For [kirklin/eslint-config](https://github.com/kirklin/eslint-config).
 
@@ -9,7 +13,7 @@ Kirklin extended ESLint rules. For [kirklin/eslint-config](https://github.com/ki
 
 ## License
 
-[MIT](./LICENSE) License © 2023-PRESENT [Kirk Lin](https://github.com/kirklin)
+[MIT](./LICENSE) License © 2023-PRESENT [Kirk Lin](https://github.com/kirklin)
 
 <!-- Badges -->
 
@@ -17,3 +21,11 @@ Kirklin extended ESLint rules. For [kirklin/eslint-config](https://github.com/ki
 [npm-version-href]: https://npmjs.com/package/eslint-plugin-kirklin
 [npm-downloads-src]: https://img.shields.io/npm/dm/eslint-plugin-kirklin?style=flat&colorA=080f12&colorB=3491fa
 [npm-downloads-href]: https://npmjs.com/package/eslint-plugin-kirklin
+[bundle-src]: https://img.shields.io/bundlephobia/minzip/eslint-plugin-kirklin?style=flat&colorA=080f12&colorB=3491fa&label=minzip
+[bundle-href]: https://bundlephobia.com/result?p=eslint-plugin-kirklin
+[license-src]: https://img.shields.io/github/license/kirklin/eslint-plugin-kirklin.svg?style=flat&colorA=080f12&colorB=3491fa
+[license-href]: https://github.com/kirklin/eslint-plugin-kirklin/blob/main/LICENSE
+[jsdocs-src]: https://img.shields.io/badge/jsdocs-reference-080f12?style=flat&colorA=080f12&colorB=3491fa
+[jsdocs-href]: https://www.jsdocs.io/package/eslint-plugin-kirklin
+[code-style-image]: https://img.shields.io/badge/code__style-%40kirklin%2Feslint--config-3491fa?style=flat&colorA=080f12&colorB=3491fa
+[code-style-url]: https://github.com/kirklin/eslint-config/

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const version = "1.0.0";
+const version = "1.1.0";
 
 const hasDocs = [
   "consistent-list-newline",
@@ -50,91 +50,9 @@ const createEslintRule = RuleCreator(
   (ruleName) => hasDocs.includes(ruleName) ? `${blobUrl}${ruleName}.md` : `${blobUrl}${ruleName}.test.ts`
 );
 
-const RULE_NAME$a = "generic-spacing";
-const PRESERVE_PREFIX_SPACE_BEFORE_GENERIC = /* @__PURE__ */ new Set(["TSCallSignatureDeclaration", "ArrowFunctionExpression", "TSFunctionType", "FunctionExpression"]);
-const genericSpacing = createEslintRule({
-  name: RULE_NAME$a,
-  meta: {
-    type: "layout",
-    docs: {
-      description: "Spaces around generic type parameters",
-      recommended: "stylistic"
-    },
-    fixable: "whitespace",
-    schema: [],
-    messages: {
-      genericSpacingMismatch: "Generic spaces mismatch"
-    }
-  },
-  defaultOptions: [],
-  create: (context) => {
-    const sourceCode = context.getSourceCode();
-    return {
-      TSTypeParameterDeclaration: (node) => {
-        if (!PRESERVE_PREFIX_SPACE_BEFORE_GENERIC.has(node.parent.type)) {
-          const pre = sourceCode.text.slice(0, node.range[0]);
-          const preSpace = pre.match(/(\s+)$/)?.[0];
-          if (preSpace && preSpace.length) {
-            context.report({
-              node,
-              messageId: "genericSpacingMismatch",
-              *fix(fixer) {
-                yield fixer.replaceTextRange([node.range[0] - preSpace.length, node.range[0]], "");
-              }
-            });
-          }
-        }
-        const params = node.params;
-        for (let i = 1; i < params.length; i++) {
-          const prev = params[i - 1];
-          const current = params[i];
-          const from = prev.range[1];
-          const to = current.range[0];
-          const span = sourceCode.text.slice(from, to);
-          if (span !== ", " && !span.match(/,\s*\r?\n/)) {
-            context.report({
-              *fix(fixer) {
-                yield fixer.replaceTextRange([from, to], ", ");
-              },
-              loc: {
-                start: prev.loc.end,
-                end: current.loc.start
-              },
-              messageId: "genericSpacingMismatch",
-              node
-            });
-          }
-        }
-      },
-      // add space around = in type Foo<T = true>
-      TSTypeParameter: (node) => {
-        if (!node.default) {
-          return;
-        }
-        const endNode = node.constraint || node.name;
-        const from = endNode.range[1];
-        const to = node.default.range[0];
-        if (sourceCode.text.slice(from, to) !== " = ") {
-          context.report({
-            *fix(fixer) {
-              yield fixer.replaceTextRange([from, to], " = ");
-            },
-            loc: {
-              start: endNode.loc.end,
-              end: node.default.loc.start
-            },
-            messageId: "genericSpacingMismatch",
-            node
-          });
-        }
-      }
-    };
-  }
-});
-
-const RULE_NAME$9 = "if-newline";
+const RULE_NAME$6 = "if-newline";
 const ifNewline = createEslintRule({
-  name: RULE_NAME$9,
+  name: RULE_NAME$6,
   meta: {
     type: "layout",
     docs: {
@@ -175,9 +93,9 @@ const ifNewline = createEslintRule({
   }
 });
 
-const RULE_NAME$8 = "import-dedupe";
+const RULE_NAME$5 = "import-dedupe";
 const importDedupe = createEslintRule({
-  name: RULE_NAME$8,
+  name: RULE_NAME$5,
   meta: {
     type: "problem",
     docs: {
@@ -225,66 +143,9 @@ const importDedupe = createEslintRule({
   }
 });
 
-const RULE_NAME$7 = "prefer-inline-type-import";
-const preferInlineTypeImport = createEslintRule({
-  name: RULE_NAME$7,
-  meta: {
-    type: "suggestion",
-    docs: {
-      description: "Inline type import"
-    },
-    fixable: "code",
-    schema: [],
-    messages: {
-      preferInlineTypeImport: "Prefer inline type import"
-    }
-  },
-  defaultOptions: [],
-  create: (context) => {
-    const sourceCode = context.getSourceCode();
-    return {
-      ImportDeclaration: (node) => {
-        if (node.specifiers.length === 1 && ["ImportNamespaceSpecifier", "ImportDefaultSpecifier"].includes(node.specifiers[0].type)) {
-          return;
-        }
-        if (node.importKind === "type" && node.specifiers.length > 0) {
-          context.report({
-            *fix(fixer) {
-              yield* removeTypeSpecifier(fixer, sourceCode, node);
-              for (const specifier of node.specifiers) {
-                yield fixer.insertTextBefore(specifier, "type ");
-              }
-            },
-            loc: node.loc,
-            messageId: "preferInlineTypeImport",
-            node
-          });
-        }
-      }
-    };
-  }
-});
-function* removeTypeSpecifier(fixer, sourceCode, node) {
-  const importKeyword = sourceCode.getFirstToken(node);
-  if (!importKeyword) {
-    return;
-  }
-  const typeIdentifier = sourceCode.getTokenAfter(importKeyword);
-  if (!typeIdentifier) {
-    return;
-  }
-  yield fixer.remove(typeIdentifier);
-  if (importKeyword.loc.end.column + 1 === typeIdentifier.loc.start.column) {
-    yield fixer.removeRange([
-      importKeyword.range[1],
-      importKeyword.range[1] + 1
-    ]);
-  }
-}
-
-const RULE_NAME$6 = "top-level-function";
+const RULE_NAME$4 = "top-level-function";
 const topLevelFunction = createEslintRule({
-  name: RULE_NAME$6,
+  name: RULE_NAME$4,
   meta: {
     type: "problem",
     docs: {
@@ -355,9 +216,9 @@ const topLevelFunction = createEslintRule({
   }
 });
 
-const RULE_NAME$5 = "no-import-node-modules-by-path";
+const RULE_NAME$3 = "no-import-node-modules-by-path";
 const noImportNodeModulesByPath = createEslintRule({
-  name: RULE_NAME$5,
+  name: RULE_NAME$3,
   meta: {
     type: "problem",
     docs: {
@@ -393,51 +254,53 @@ const noImportNodeModulesByPath = createEslintRule({
   }
 });
 
-const RULE_NAME$4 = "no-ts-export-equal";
-const noTsExportEqual = createEslintRule({
-  name: RULE_NAME$4,
+const RULE_NAME$2 = "no-import-dist";
+const noImportDist = createEslintRule({
+  name: RULE_NAME$2,
   meta: {
     type: "problem",
     docs: {
-      description: "Do not use `exports =`",
+      description: "Prevent importing modules in `dist` folder",
       recommended: "recommended"
     },
     schema: [],
     messages: {
-      noTsExportEqual: "Use ESM `export default` instead"
+      noImportDist: "Do not import modules in `dist` folder, got {{path}}"
     }
   },
   defaultOptions: [],
   create: (context) => {
-    const extension = context.getFilename().split(".").pop();
-    if (!extension) {
-      return {};
-    }
-    if (!["ts", "tsx", "mts", "cts"].includes(extension)) {
-      return {};
+    function isDist(path) {
+      return path.startsWith(".") && path.match(/\/dist(\/|$)/) || path === "dist";
     }
     return {
-      TSExportAssignment(node) {
-        context.report({
-          node,
-          messageId: "noTsExportEqual"
-        });
+      ImportDeclaration: (node) => {
+        if (isDist(node.source.value)) {
+          context.report({
+            node,
+            messageId: "noImportDist",
+            data: {
+              path: node.source.value
+            }
+          });
+        }
       }
     };
   }
 });
 
-const RULE_NAME$3 = "no-cjs-exports";
-const noCjsExports = createEslintRule({
-  name: RULE_NAME$3,
+const RULE_NAME$1 = "no-ts-export-equal";
+const noTsExportEqual = createEslintRule({
+  name: RULE_NAME$1,
   meta: {
     type: "problem",
     docs: {
-      description: "Do not use CJS exports"
+      description: "Do not use `exports =`",
+      recommended: "recommended"
     },
     schema: [],
     messages: {
-      noCjsExports: "Use ESM export instead"
+      noTsExportEqual: "Use ESM `export default` instead"
     }
   },
   defaultOptions: [],
@@ -450,125 +313,16 @@ const noCjsExports = createEslintRule({
       return {};
     }
     return {
-      'MemberExpression[object.name="exports"]': function(node) {
-        context.report({
-          node,
-          messageId: "noCjsExports"
-        });
-      },
-      'MemberExpression[object.name="module"][property.name="exports"]': function(node) {
+      TSExportAssignment(node) {
         context.report({
           node,
-          messageId: "noCjsExports"
+          messageId: "noTsExportEqual"
         });
       }
     };
   }
 });
 
-const RULE_NAME$2 = "no-const-enum";
-const noConstEnum = createEslintRule({
-  name: RULE_NAME$2,
-  meta: {
-    type: "problem",
-    docs: {
-      description: "Deprecated. Use `'no-restricted-syntax': ['error', 'TSEnumDeclaration[const=true]']` instead."
-    },
-    schema: [],
-    messages: {
-      noConstEnum: "Do not use `const enum` expression"
-    },
-    deprecated: true
-  },
-  defaultOptions: [],
-  create: (context) => {
-    return {
-      TSEnumDeclaration: (node) => {
-        if (node.const) {
-          context.report({
-            node,
-            messageId: "noConstEnum"
-          });
-        }
-      }
-    };
-  }
-});
-
-const RULE_NAME$1 = "named-tuple-spacing";
-const RE = /^([\w_$]+)(\s*)(\?\s*)?:(\s*)(.*)$/;
-const namedTupleSpacing = createEslintRule({
-  name: RULE_NAME$1,
-  meta: {
-    type: "layout",
-    docs: {
-      description: "Expect space before type declaration in named tuple",
-      recommended: "stylistic"
-    },
-    fixable: "whitespace",
-    schema: [],
-    messages: {
-      expectedSpaceAfter: "Expected a space after the ':'.",
-      unexpectedSpaceBetween: "Unexpected space between '?' and the ':'.",
-      unexpectedSpaceBefore: "Unexpected space before the ':'."
-    }
-  },
-  defaultOptions: [],
-  create: (context) => {
-    const sourceCode = context.getSourceCode();
-    return {
-      TSNamedTupleMember: (node) => {
-        const code = sourceCode.text.slice(node.range[0], node.range[1]);
-        const match = code.match(RE);
-        if (!match) {
-          return;
-        }
-        const labelName = node.label.name;
-        const spaceBeforeColon = match[2];
-        const optionalMark = match[3];
-        const spacesAfterColon = match[4];
-        const elementType = match[5];
-        function getReplaceValue() {
-          let ret = labelName;
-          if (node.optional) {
-            ret += "?";
-          }
-          ret += ": ";
-          ret += elementType;
-          return ret;
-        }
-        if (optionalMark?.length > 1) {
-          context.report({
-            node,
-            messageId: "unexpectedSpaceBetween",
-            *fix(fixer) {
-              yield fixer.replaceTextRange(node.range, code.replace(RE, getReplaceValue()));
-            }
-          });
-        }
-        if (spaceBeforeColon?.length) {
-          context.report({
-            node,
-            messageId: "unexpectedSpaceBefore",
-            *fix(fixer) {
-              yield fixer.replaceTextRange(node.range, code.replace(RE, getReplaceValue()));
-            }
-          });
-        }
-        if (spacesAfterColon != null && spacesAfterColon.length !== 1) {
-          context.report({
-            node,
-            messageId: "expectedSpaceAfter",
-            *fix(fixer) {
-              yield fixer.replaceTextRange(node.range, code.replace(RE, getReplaceValue()));
-            }
-          });
-        }
-      }
-    };
-  }
-});
-
 const RULE_NAME = "consistent-list-newline";
 const consistentListNewline = createEslintRule({
   name: RULE_NAME,
@@ -579,25 +333,51 @@ const consistentListNewline = createEslintRule({
       recommended: "stylistic"
     },
     fixable: "whitespace",
-    schema: [],
+    schema: [{
+      type: "object",
+      properties: {
+        ArrayExpression: { type: "boolean" },
+        ArrowFunctionExpression: { type: "boolean" },
+        CallExpression: { type: "boolean" },
+        ExportNamedDeclaration: { type: "boolean" },
+        FunctionDeclaration: { type: "boolean" },
+        FunctionExpression: { type: "boolean" },
+        ImportDeclaration: { type: "boolean" },
+        NewExpression: { type: "boolean" },
+        ObjectExpression: { type: "boolean" },
+        TSInterfaceDeclaration: { type: "boolean" },
+        TSTupleType: { type: "boolean" },
+        TSTypeLiteral: { type: "boolean" },
+        TSTypeParameterDeclaration: { type: "boolean" },
+        TSTypeParameterInstantiation: { type: "boolean" },
+        ObjectPattern: { type: "boolean" },
+        ArrayPattern: { type: "boolean" }
+      },
+      additionalProperties: false
+    }],
     messages: {
-      shouldWrap: "Should have line breaks between items",
-      shouldNotWrap: "Should not have line breaks between items"
+      shouldWrap: "Should have line breaks between items, in node {{name}}",
+      shouldNotWrap: "Should not have line breaks between items, in node {{name}}"
     }
   },
   defaultOptions: [{}],
   create: (context, [options = {}] = [{}]) => {
     function removeLines(fixer, start, end) {
       const range = [start, end];
-      const code = context.getSourceCode().text.slice(...range);
+      const code = context.sourceCode.text.slice(...range);
       return fixer.replaceTextRange(range, code.replace(/(\r\n|\n)/g, ""));
     }
-    function check(node, children, prevNode, nextNode) {
+    function check(node, children, nextNode) {
       const items = children.filter(Boolean);
       if (items.length === 0) {
         return;
       }
-      const startLine = prevNode ? prevNode.loc.end.line : node.loc.start.line;
+      const startToken = context.sourceCode.getTokenBefore(items[0]);
+      const endToken = context.sourceCode.getTokenAfter(items[items.length - 1]);
+      const startLine = startToken.loc.start.line;
+      if (startToken.loc.start.line === endToken.loc.end.line) {
+        return;
+      }
       let mode = null;
       let lastLine = startLine;
       items.forEach((item, idx) => {
@@ -611,6 +391,9 @@ const consistentListNewline = createEslintRule({
           context.report({
             node: item,
             messageId: "shouldWrap",
+            data: {
+              name: node.type
+            },
             *fix(fixer) {
               yield fixer.insertTextBefore(item, "\n");
             }
@@ -620,6 +403,9 @@ const consistentListNewline = createEslintRule({
           context.report({
             node: item,
             messageId: "shouldNotWrap",
+            data: {
+              name: node.type
+            },
             *fix(fixer) {
               yield removeLines(fixer, lastItem2.range[1], item.range[0]);
             }
@@ -627,13 +413,19 @@ const consistentListNewline = createEslintRule({
         }
         lastLine = item.loc.end.line;
       });
-      const endLoc = nextNode?.loc.start ?? node.loc.end;
-      const endRange = nextNode?.range[0] ? nextNode?.range[0] - 1 : node.range[1];
+      const endRange = nextNode ? Math.min(
+        context.sourceCode.getTokenBefore(nextNode).range[0],
+        node.range[1]
+      ) : node.range[1];
+      const endLoc = context.sourceCode.getLocFromIndex(endRange);
       const lastItem = items[items.length - 1];
       if (mode === "newline" && endLoc.line === lastLine) {
         context.report({
           node: lastItem,
           messageId: "shouldWrap",
+          data: {
+            name: node.type
+          },
           *fix(fixer) {
             yield fixer.insertTextAfter(lastItem, "\n");
           }
@@ -642,13 +434,19 @@ const consistentListNewline = createEslintRule({
         if (items.length === 1 && items[0].loc.start.line !== items[1]?.loc.start.line) {
           return;
         }
-        context.report({
-          node: lastItem,
-          messageId: "shouldNotWrap",
-          *fix(fixer) {
-            yield removeLines(fixer, lastItem.range[1], endRange);
-          }
-        });
+        const content = context.sourceCode.text.slice(lastItem.range[1], endRange);
+        if (content.includes("\n")) {
+          context.report({
+            node: lastItem,
+            messageId: "shouldNotWrap",
+            data: {
+              name: node.type
+            },
+            *fix(fixer) {
+              yield removeLines(fixer, lastItem.range[1], endRange);
+            }
+          });
+        }
       }
     }
     const listenser = {
@@ -668,7 +466,6 @@ const consistentListNewline = createEslintRule({
         check(
           node,
           node.params,
-          node.typeParameters || void 0,
           node.returnType || node.body
         );
       },
@@ -676,21 +473,21 @@ const consistentListNewline = createEslintRule({
         check(
           node,
           node.params,
-          node.typeParameters || void 0,
           node.returnType || node.body
         );
       },
       ArrowFunctionExpression: (node) => {
+        if (node.params.length <= 1) {
+          return;
+        }
         check(
           node,
           node.params,
-          node.typeParameters || void 0,
           node.returnType || node.body
         );
       },
       CallExpression: (node) => {
-        const startNode = node.typeArguments?.params.length ? node.typeArguments.params[node.typeArguments.params.length - 1] : node.callee.type === "MemberExpression" ? node.callee.property : node.callee;
-        check(node, node.arguments, startNode);
+        check(node, node.arguments);
       },
       TSInterfaceDeclaration: (node) => {
         check(node, node.body.body);
@@ -702,7 +499,7 @@ const consistentListNewline = createEslintRule({
         check(node, node.elementTypes);
       },
       NewExpression: (node) => {
-        check(node, node.arguments, node.callee);
+        check(node, node.arguments);
       },
       TSTypeParameterDeclaration(node) {
         check(node, node.params);
@@ -711,7 +508,7 @@ const consistentListNewline = createEslintRule({
         check(node, node.params);
       },
       ObjectPattern(node) {
-        check(node, node.properties, void 0, node.typeAnnotation);
+        check(node, node.properties, node.typeAnnotation);
       },
       ArrayPattern(node) {
         check(node, node.elements);
@@ -733,19 +530,12 @@ const plugin = {
   },
   rules: {
     "consistent-list-newline": consistentListNewline,
-    "generic-spacing": genericSpacing,
     "if-newline": ifNewline,
     "import-dedupe": importDedupe,
-    "named-tuple-spacing": namedTupleSpacing,
-    "no-cjs-exports": noCjsExports,
     "no-import-node-modules-by-path": noImportNodeModulesByPath,
+    "no-import-dist": noImportDist,
     "no-ts-export-equal": noTsExportEqual,
-    "prefer-inline-type-import": preferInlineTypeImport,
-    "top-level-function": topLevelFunction,
-    /**
-     * @deprecated Use `'no-restricted-syntax': ['error', 'TSEnumDeclaration[const=true]']` instead.
-     */
-    "no-const-enum": noConstEnum
+    "top-level-function": topLevelFunction
   }
 };
 

package/dist/index.d.cts

@@ -32,25 +32,18 @@ declare const plugin: {
     };
     rules: {
         "consistent-list-newline": RuleModule<Options>;
-        "generic-spacing": RuleModule<[]>;
         "if-newline": RuleModule<[]>;
         "import-dedupe": RuleModule<[]>;
-        "named-tuple-spacing": RuleModule<[]>;
-        "no-cjs-exports": RuleModule<[]>;
         "no-import-node-modules-by-path": RuleModule<[]>;
+        "no-import-dist": RuleModule<[]>;
         "no-ts-export-equal": RuleModule<[]>;
-        "prefer-inline-type-import": RuleModule<[]>;
         "top-level-function": RuleModule<[]>;
-        /**
-         * @deprecated Use `'no-restricted-syntax': ['error', 'TSEnumDeclaration[const=true]']` instead.
-         */
-        "no-const-enum": RuleModule<[]>;
     };
 };
 
-type RuleDefinitations = typeof plugin["rules"];
+type RuleDefinitions = typeof plugin["rules"];
 type RuleOptions = {
-    [K in keyof RuleDefinitations]: RuleDefinitations[K]["defaultOptions"];
+    [K in keyof RuleDefinitions]: RuleDefinitions[K]["defaultOptions"];
 };
 type Rules = {
     [K in keyof RuleOptions]: Linter.RuleEntry<RuleOptions[K]>;

package/dist/index.d.mts

@@ -32,25 +32,18 @@ declare const plugin: {
     };
     rules: {
         "consistent-list-newline": RuleModule<Options>;
-        "generic-spacing": RuleModule<[]>;
         "if-newline": RuleModule<[]>;
         "import-dedupe": RuleModule<[]>;
-        "named-tuple-spacing": RuleModule<[]>;
-        "no-cjs-exports": RuleModule<[]>;
         "no-import-node-modules-by-path": RuleModule<[]>;
+        "no-import-dist": RuleModule<[]>;
         "no-ts-export-equal": RuleModule<[]>;
-        "prefer-inline-type-import": RuleModule<[]>;
         "top-level-function": RuleModule<[]>;
-        /**
-         * @deprecated Use `'no-restricted-syntax': ['error', 'TSEnumDeclaration[const=true]']` instead.
-         */
-        "no-const-enum": RuleModule<[]>;
     };
 };
 
-type RuleDefinitations = typeof plugin["rules"];
+type RuleDefinitions = typeof plugin["rules"];
 type RuleOptions = {
-    [K in keyof RuleDefinitations]: RuleDefinitations[K]["defaultOptions"];
+    [K in keyof RuleDefinitions]: RuleDefinitions[K]["defaultOptions"];
 };
 type Rules = {
     [K in keyof RuleOptions]: Linter.RuleEntry<RuleOptions[K]>;

package/dist/index.d.ts

@@ -32,25 +32,18 @@ declare const plugin: {
     };
     rules: {
         "consistent-list-newline": RuleModule<Options>;
-        "generic-spacing": RuleModule<[]>;
         "if-newline": RuleModule<[]>;
         "import-dedupe": RuleModule<[]>;
-        "named-tuple-spacing": RuleModule<[]>;
-        "no-cjs-exports": RuleModule<[]>;
         "no-import-node-modules-by-path": RuleModule<[]>;
+        "no-import-dist": RuleModule<[]>;
         "no-ts-export-equal": RuleModule<[]>;
-        "prefer-inline-type-import": RuleModule<[]>;
         "top-level-function": RuleModule<[]>;
-        /**
-         * @deprecated Use `'no-restricted-syntax': ['error', 'TSEnumDeclaration[const=true]']` instead.
-         */
-        "no-const-enum": RuleModule<[]>;
     };
 };
 
-type RuleDefinitations = typeof plugin["rules"];
+type RuleDefinitions = typeof plugin["rules"];
 type RuleOptions = {
-    [K in keyof RuleDefinitations]: RuleDefinitations[K]["defaultOptions"];
+    [K in keyof RuleDefinitions]: RuleDefinitions[K]["defaultOptions"];
 };
 type Rules = {
     [K in keyof RuleOptions]: Linter.RuleEntry<RuleOptions[K]>;

package/dist/index.mjs

@@ -1,4 +1,4 @@
-const version = "1.0.0";
+const version = "1.1.0";
 
 const hasDocs = [
   "consistent-list-newline",
@@ -48,91 +48,9 @@ const createEslintRule = RuleCreator(
   (ruleName) => hasDocs.includes(ruleName) ? `${blobUrl}${ruleName}.md` : `${blobUrl}${ruleName}.test.ts`
 );
 
-const RULE_NAME$a = "generic-spacing";
-const PRESERVE_PREFIX_SPACE_BEFORE_GENERIC = /* @__PURE__ */ new Set(["TSCallSignatureDeclaration", "ArrowFunctionExpression", "TSFunctionType", "FunctionExpression"]);
-const genericSpacing = createEslintRule({
-  name: RULE_NAME$a,
-  meta: {
-    type: "layout",
-    docs: {
-      description: "Spaces around generic type parameters",
-      recommended: "stylistic"
-    },
-    fixable: "whitespace",
-    schema: [],
-    messages: {
-      genericSpacingMismatch: "Generic spaces mismatch"
-    }
-  },
-  defaultOptions: [],
-  create: (context) => {
-    const sourceCode = context.getSourceCode();
-    return {
-      TSTypeParameterDeclaration: (node) => {
-        if (!PRESERVE_PREFIX_SPACE_BEFORE_GENERIC.has(node.parent.type)) {
-          const pre = sourceCode.text.slice(0, node.range[0]);
-          const preSpace = pre.match(/(\s+)$/)?.[0];
-          if (preSpace && preSpace.length) {
-            context.report({
-              node,
-              messageId: "genericSpacingMismatch",
-              *fix(fixer) {
-                yield fixer.replaceTextRange([node.range[0] - preSpace.length, node.range[0]], "");
-              }
-            });
-          }
-        }
-        const params = node.params;
-        for (let i = 1; i < params.length; i++) {
-          const prev = params[i - 1];
-          const current = params[i];
-          const from = prev.range[1];
-          const to = current.range[0];
-          const span = sourceCode.text.slice(from, to);
-          if (span !== ", " && !span.match(/,\s*\r?\n/)) {
-            context.report({
-              *fix(fixer) {
-                yield fixer.replaceTextRange([from, to], ", ");
-              },
-              loc: {
-                start: prev.loc.end,
-                end: current.loc.start
-              },
-              messageId: "genericSpacingMismatch",
-              node
-            });
-          }
-        }
-      },
-      // add space around = in type Foo<T = true>
-      TSTypeParameter: (node) => {
-        if (!node.default) {
-          return;
-        }
-        const endNode = node.constraint || node.name;
-        const from = endNode.range[1];
-        const to = node.default.range[0];
-        if (sourceCode.text.slice(from, to) !== " = ") {
-          context.report({
-            *fix(fixer) {
-              yield fixer.replaceTextRange([from, to], " = ");
-            },
-            loc: {
-              start: endNode.loc.end,
-              end: node.default.loc.start
-            },
-            messageId: "genericSpacingMismatch",
-            node
-          });
-        }
-      }
-    };
-  }
-});
-
-const RULE_NAME$9 = "if-newline";
+const RULE_NAME$6 = "if-newline";
 const ifNewline = createEslintRule({
-  name: RULE_NAME$9,
+  name: RULE_NAME$6,
   meta: {
     type: "layout",
     docs: {
@@ -173,9 +91,9 @@ const ifNewline = createEslintRule({
   }
 });
 
-const RULE_NAME$8 = "import-dedupe";
+const RULE_NAME$5 = "import-dedupe";
 const importDedupe = createEslintRule({
-  name: RULE_NAME$8,
+  name: RULE_NAME$5,
   meta: {
     type: "problem",
     docs: {
@@ -223,66 +141,9 @@ const importDedupe = createEslintRule({
   }
 });
 
-const RULE_NAME$7 = "prefer-inline-type-import";
-const preferInlineTypeImport = createEslintRule({
-  name: RULE_NAME$7,
-  meta: {
-    type: "suggestion",
-    docs: {
-      description: "Inline type import"
-    },
-    fixable: "code",
-    schema: [],
-    messages: {
-      preferInlineTypeImport: "Prefer inline type import"
-    }
-  },
-  defaultOptions: [],
-  create: (context) => {
-    const sourceCode = context.getSourceCode();
-    return {
-      ImportDeclaration: (node) => {
-        if (node.specifiers.length === 1 && ["ImportNamespaceSpecifier", "ImportDefaultSpecifier"].includes(node.specifiers[0].type)) {
-          return;
-        }
-        if (node.importKind === "type" && node.specifiers.length > 0) {
-          context.report({
-            *fix(fixer) {
-              yield* removeTypeSpecifier(fixer, sourceCode, node);
-              for (const specifier of node.specifiers) {
-                yield fixer.insertTextBefore(specifier, "type ");
-              }
-            },
-            loc: node.loc,
-            messageId: "preferInlineTypeImport",
-            node
-          });
-        }
-      }
-    };
-  }
-});
-function* removeTypeSpecifier(fixer, sourceCode, node) {
-  const importKeyword = sourceCode.getFirstToken(node);
-  if (!importKeyword) {
-    return;
-  }
-  const typeIdentifier = sourceCode.getTokenAfter(importKeyword);
-  if (!typeIdentifier) {
-    return;
-  }
-  yield fixer.remove(typeIdentifier);
-  if (importKeyword.loc.end.column + 1 === typeIdentifier.loc.start.column) {
-    yield fixer.removeRange([
-      importKeyword.range[1],
-      importKeyword.range[1] + 1
-    ]);
-  }
-}
-
-const RULE_NAME$6 = "top-level-function";
+const RULE_NAME$4 = "top-level-function";
 const topLevelFunction = createEslintRule({
-  name: RULE_NAME$6,
+  name: RULE_NAME$4,
   meta: {
     type: "problem",
     docs: {
@@ -353,9 +214,9 @@ const topLevelFunction = createEslintRule({
   }
 });
 
-const RULE_NAME$5 = "no-import-node-modules-by-path";
+const RULE_NAME$3 = "no-import-node-modules-by-path";
 const noImportNodeModulesByPath = createEslintRule({
-  name: RULE_NAME$5,
+  name: RULE_NAME$3,
   meta: {
     type: "problem",
     docs: {
@@ -391,51 +252,53 @@ const noImportNodeModulesByPath = createEslintRule({
   }
 });
 
-const RULE_NAME$4 = "no-ts-export-equal";
-const noTsExportEqual = createEslintRule({
-  name: RULE_NAME$4,
+const RULE_NAME$2 = "no-import-dist";
+const noImportDist = createEslintRule({
+  name: RULE_NAME$2,
   meta: {
     type: "problem",
     docs: {
-      description: "Do not use `exports =`",
+      description: "Prevent importing modules in `dist` folder",
       recommended: "recommended"
     },
     schema: [],
     messages: {
-      noTsExportEqual: "Use ESM `export default` instead"
+      noImportDist: "Do not import modules in `dist` folder, got {{path}}"
     }
   },
   defaultOptions: [],
   create: (context) => {
-    const extension = context.getFilename().split(".").pop();
-    if (!extension) {
-      return {};
-    }
-    if (!["ts", "tsx", "mts", "cts"].includes(extension)) {
-      return {};
+    function isDist(path) {
+      return path.startsWith(".") && path.match(/\/dist(\/|$)/) || path === "dist";
     }
     return {
-      TSExportAssignment(node) {
-        context.report({
-          node,
-          messageId: "noTsExportEqual"
-        });
+      ImportDeclaration: (node) => {
+        if (isDist(node.source.value)) {
+          context.report({
+            node,
+            messageId: "noImportDist",
+            data: {
+              path: node.source.value
+            }
+          });
+        }
       }
     };
   }
 });
 
-const RULE_NAME$3 = "no-cjs-exports";
-const noCjsExports = createEslintRule({
-  name: RULE_NAME$3,
+const RULE_NAME$1 = "no-ts-export-equal";
+const noTsExportEqual = createEslintRule({
+  name: RULE_NAME$1,
   meta: {
     type: "problem",
     docs: {
-      description: "Do not use CJS exports"
+      description: "Do not use `exports =`",
+      recommended: "recommended"
     },
     schema: [],
     messages: {
-      noCjsExports: "Use ESM export instead"
+      noTsExportEqual: "Use ESM `export default` instead"
     }
   },
   defaultOptions: [],
@@ -448,125 +311,16 @@ const noCjsExports = createEslintRule({
       return {};
     }
     return {
-      'MemberExpression[object.name="exports"]': function(node) {
-        context.report({
-          node,
-          messageId: "noCjsExports"
-        });
-      },
-      'MemberExpression[object.name="module"][property.name="exports"]': function(node) {
+      TSExportAssignment(node) {
         context.report({
           node,
-          messageId: "noCjsExports"
+          messageId: "noTsExportEqual"
         });
       }
     };
   }
 });
 
-const RULE_NAME$2 = "no-const-enum";
-const noConstEnum = createEslintRule({
-  name: RULE_NAME$2,
-  meta: {
-    type: "problem",
-    docs: {
-      description: "Deprecated. Use `'no-restricted-syntax': ['error', 'TSEnumDeclaration[const=true]']` instead."
-    },
-    schema: [],
-    messages: {
-      noConstEnum: "Do not use `const enum` expression"
-    },
-    deprecated: true
-  },
-  defaultOptions: [],
-  create: (context) => {
-    return {
-      TSEnumDeclaration: (node) => {
-        if (node.const) {
-          context.report({
-            node,
-            messageId: "noConstEnum"
-          });
-        }
-      }
-    };
-  }
-});
-
-const RULE_NAME$1 = "named-tuple-spacing";
-const RE = /^([\w_$]+)(\s*)(\?\s*)?:(\s*)(.*)$/;
-const namedTupleSpacing = createEslintRule({
-  name: RULE_NAME$1,
-  meta: {
-    type: "layout",
-    docs: {
-      description: "Expect space before type declaration in named tuple",
-      recommended: "stylistic"
-    },
-    fixable: "whitespace",
-    schema: [],
-    messages: {
-      expectedSpaceAfter: "Expected a space after the ':'.",
-      unexpectedSpaceBetween: "Unexpected space between '?' and the ':'.",
-      unexpectedSpaceBefore: "Unexpected space before the ':'."
-    }
-  },
-  defaultOptions: [],
-  create: (context) => {
-    const sourceCode = context.getSourceCode();
-    return {
-      TSNamedTupleMember: (node) => {
-        const code = sourceCode.text.slice(node.range[0], node.range[1]);
-        const match = code.match(RE);
-        if (!match) {
-          return;
-        }
-        const labelName = node.label.name;
-        const spaceBeforeColon = match[2];
-        const optionalMark = match[3];
-        const spacesAfterColon = match[4];
-        const elementType = match[5];
-        function getReplaceValue() {
-          let ret = labelName;
-          if (node.optional) {
-            ret += "?";
-          }
-          ret += ": ";
-          ret += elementType;
-          return ret;
-        }
-        if (optionalMark?.length > 1) {
-          context.report({
-            node,
-            messageId: "unexpectedSpaceBetween",
-            *fix(fixer) {
-              yield fixer.replaceTextRange(node.range, code.replace(RE, getReplaceValue()));
-            }
-          });
-        }
-        if (spaceBeforeColon?.length) {
-          context.report({
-            node,
-            messageId: "unexpectedSpaceBefore",
-            *fix(fixer) {
-              yield fixer.replaceTextRange(node.range, code.replace(RE, getReplaceValue()));
-            }
-          });
-        }
-        if (spacesAfterColon != null && spacesAfterColon.length !== 1) {
-          context.report({
-            node,
-            messageId: "expectedSpaceAfter",
-            *fix(fixer) {
-              yield fixer.replaceTextRange(node.range, code.replace(RE, getReplaceValue()));
-            }
-          });
-        }
-      }
-    };
-  }
-});
-
 const RULE_NAME = "consistent-list-newline";
 const consistentListNewline = createEslintRule({
   name: RULE_NAME,
@@ -577,25 +331,51 @@ const consistentListNewline = createEslintRule({
       recommended: "stylistic"
     },
     fixable: "whitespace",
-    schema: [],
+    schema: [{
+      type: "object",
+      properties: {
+        ArrayExpression: { type: "boolean" },
+        ArrowFunctionExpression: { type: "boolean" },
+        CallExpression: { type: "boolean" },
+        ExportNamedDeclaration: { type: "boolean" },
+        FunctionDeclaration: { type: "boolean" },
+        FunctionExpression: { type: "boolean" },
+        ImportDeclaration: { type: "boolean" },
+        NewExpression: { type: "boolean" },
+        ObjectExpression: { type: "boolean" },
+        TSInterfaceDeclaration: { type: "boolean" },
+        TSTupleType: { type: "boolean" },
+        TSTypeLiteral: { type: "boolean" },
+        TSTypeParameterDeclaration: { type: "boolean" },
+        TSTypeParameterInstantiation: { type: "boolean" },
+        ObjectPattern: { type: "boolean" },
+        ArrayPattern: { type: "boolean" }
+      },
+      additionalProperties: false
+    }],
     messages: {
-      shouldWrap: "Should have line breaks between items",
-      shouldNotWrap: "Should not have line breaks between items"
+      shouldWrap: "Should have line breaks between items, in node {{name}}",
+      shouldNotWrap: "Should not have line breaks between items, in node {{name}}"
     }
   },
   defaultOptions: [{}],
   create: (context, [options = {}] = [{}]) => {
     function removeLines(fixer, start, end) {
       const range = [start, end];
-      const code = context.getSourceCode().text.slice(...range);
+      const code = context.sourceCode.text.slice(...range);
       return fixer.replaceTextRange(range, code.replace(/(\r\n|\n)/g, ""));
     }
-    function check(node, children, prevNode, nextNode) {
+    function check(node, children, nextNode) {
       const items = children.filter(Boolean);
       if (items.length === 0) {
         return;
       }
-      const startLine = prevNode ? prevNode.loc.end.line : node.loc.start.line;
+      const startToken = context.sourceCode.getTokenBefore(items[0]);
+      const endToken = context.sourceCode.getTokenAfter(items[items.length - 1]);
+      const startLine = startToken.loc.start.line;
+      if (startToken.loc.start.line === endToken.loc.end.line) {
+        return;
+      }
       let mode = null;
       let lastLine = startLine;
       items.forEach((item, idx) => {
@@ -609,6 +389,9 @@ const consistentListNewline = createEslintRule({
           context.report({
             node: item,
             messageId: "shouldWrap",
+            data: {
+              name: node.type
+            },
             *fix(fixer) {
               yield fixer.insertTextBefore(item, "\n");
             }
@@ -618,6 +401,9 @@ const consistentListNewline = createEslintRule({
           context.report({
             node: item,
             messageId: "shouldNotWrap",
+            data: {
+              name: node.type
+            },
             *fix(fixer) {
               yield removeLines(fixer, lastItem2.range[1], item.range[0]);
             }
@@ -625,13 +411,19 @@ const consistentListNewline = createEslintRule({
         }
         lastLine = item.loc.end.line;
       });
-      const endLoc = nextNode?.loc.start ?? node.loc.end;
-      const endRange = nextNode?.range[0] ? nextNode?.range[0] - 1 : node.range[1];
+      const endRange = nextNode ? Math.min(
+        context.sourceCode.getTokenBefore(nextNode).range[0],
+        node.range[1]
+      ) : node.range[1];
+      const endLoc = context.sourceCode.getLocFromIndex(endRange);
       const lastItem = items[items.length - 1];
       if (mode === "newline" && endLoc.line === lastLine) {
         context.report({
           node: lastItem,
           messageId: "shouldWrap",
+          data: {
+            name: node.type
+          },
           *fix(fixer) {
             yield fixer.insertTextAfter(lastItem, "\n");
           }
@@ -640,13 +432,19 @@ const consistentListNewline = createEslintRule({
         if (items.length === 1 && items[0].loc.start.line !== items[1]?.loc.start.line) {
           return;
         }
-        context.report({
-          node: lastItem,
-          messageId: "shouldNotWrap",
-          *fix(fixer) {
-            yield removeLines(fixer, lastItem.range[1], endRange);
-          }
-        });
+        const content = context.sourceCode.text.slice(lastItem.range[1], endRange);
+        if (content.includes("\n")) {
+          context.report({
+            node: lastItem,
+            messageId: "shouldNotWrap",
+            data: {
+              name: node.type
+            },
+            *fix(fixer) {
+              yield removeLines(fixer, lastItem.range[1], endRange);
+            }
+          });
+        }
       }
     }
     const listenser = {
@@ -666,7 +464,6 @@ const consistentListNewline = createEslintRule({
         check(
           node,
           node.params,
-          node.typeParameters || void 0,
           node.returnType || node.body
         );
       },
@@ -674,21 +471,21 @@ const consistentListNewline = createEslintRule({
         check(
           node,
           node.params,
-          node.typeParameters || void 0,
           node.returnType || node.body
         );
       },
       ArrowFunctionExpression: (node) => {
+        if (node.params.length <= 1) {
+          return;
+        }
         check(
           node,
           node.params,
-          node.typeParameters || void 0,
           node.returnType || node.body
         );
       },
       CallExpression: (node) => {
-        const startNode = node.typeArguments?.params.length ? node.typeArguments.params[node.typeArguments.params.length - 1] : node.callee.type === "MemberExpression" ? node.callee.property : node.callee;
-        check(node, node.arguments, startNode);
+        check(node, node.arguments);
       },
       TSInterfaceDeclaration: (node) => {
         check(node, node.body.body);
@@ -700,7 +497,7 @@ const consistentListNewline = createEslintRule({
         check(node, node.elementTypes);
       },
       NewExpression: (node) => {
-        check(node, node.arguments, node.callee);
+        check(node, node.arguments);
       },
       TSTypeParameterDeclaration(node) {
         check(node, node.params);
@@ -709,7 +506,7 @@ const consistentListNewline = createEslintRule({
         check(node, node.params);
       },
       ObjectPattern(node) {
-        check(node, node.properties, void 0, node.typeAnnotation);
+        check(node, node.properties, node.typeAnnotation);
       },
       ArrayPattern(node) {
         check(node, node.elements);
@@ -731,19 +528,12 @@ const plugin = {
   },
   rules: {
     "consistent-list-newline": consistentListNewline,
-    "generic-spacing": genericSpacing,
     "if-newline": ifNewline,
     "import-dedupe": importDedupe,
-    "named-tuple-spacing": namedTupleSpacing,
-    "no-cjs-exports": noCjsExports,
     "no-import-node-modules-by-path": noImportNodeModulesByPath,
+    "no-import-dist": noImportDist,
     "no-ts-export-equal": noTsExportEqual,
-    "prefer-inline-type-import": preferInlineTypeImport,
-    "top-level-function": topLevelFunction,
-    /**
-     * @deprecated Use `'no-restricted-syntax': ['error', 'TSEnumDeclaration[const=true]']` instead.
-     */
-    "no-const-enum": noConstEnum
+    "top-level-function": topLevelFunction
   }
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eslint-plugin-kirklin",
   "type": "module",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "packageManager": "pnpm@8.10.2",
   "description": "Kirk Lin extended ESLint rules",
   "author": "Kirk Lin (https://github.com/kirklin)",
@@ -45,7 +45,7 @@
   },
   "devDependencies": {
     "@antfu/ni": "^0.21.8",
-    "@kirklin/eslint-config": "^1.0.0",
+    "@kirklin/eslint-config": "^1.1.1",
     "@types/eslint": "^8.44.6",
     "@types/lodash.merge": "^4.6.8",
     "@types/node": "^20.8.10",
@@ -79,4 +79,4 @@
   "lint-staged": {
     "*": "eslint --fix"
   }
-}
+}