@so1ve/eslint-plugin 0.35.5 → 0.36.1

package/dist/index.cjs

@@ -4,9 +4,9 @@ const utils = require('@typescript-eslint/utils');
 
 const createEslintRule = utils.ESLintUtils.RuleCreator((ruleName) => ruleName);
 
-const RULE_NAME$4 = "generic-spacing";
+const RULE_NAME$5 = "generic-spacing";
 const genericSpacing = createEslintRule({
-  name: RULE_NAME$4,
+  name: RULE_NAME$5,
   meta: {
     type: "suggestion",
     docs: {
@@ -170,9 +170,9 @@ const genericSpacing = createEslintRule({
   }
 });
 
-const RULE_NAME$3 = "import-dedupe";
+const RULE_NAME$4 = "import-dedupe";
 const importDedupe = createEslintRule({
-  name: RULE_NAME$3,
+  name: RULE_NAME$4,
   meta: {
     type: "problem",
     docs: {
@@ -220,9 +220,9 @@ const importDedupe = createEslintRule({
   }
 });
 
-const RULE_NAME$2 = "space-between-generic-and-paren";
+const RULE_NAME$3 = "space-between-generic-and-paren";
 const spaceBetweenGenericAndParen = createEslintRule({
-  name: RULE_NAME$2,
+  name: RULE_NAME$3,
   meta: {
     type: "suggestion",
     docs: {
@@ -232,7 +232,7 @@ const spaceBetweenGenericAndParen = createEslintRule({
     fixable: "code",
     schema: [],
     messages: {
-      spaceBetweenGenericAndParenMismatch: "Space between generic and paren mismatch"
+      noSpaceBetweenGenericAndParen: "Expected no space between generic type parameters and paren"
     }
   },
   defaultOptions: [],
@@ -261,7 +261,7 @@ const spaceBetweenGenericAndParen = createEslintRule({
               }
             },
             node,
-            messageId: "spaceBetweenGenericAndParenMismatch",
+            messageId: "noSpaceBetweenGenericAndParen",
             *fix(fixer) {
               yield fixer.replaceTextRange([spaceStartRange, spaceStartRange + postSpace.length], "");
             }
@@ -284,7 +284,7 @@ const spaceBetweenGenericAndParen = createEslintRule({
                 }
               },
               node,
-              messageId: "spaceBetweenGenericAndParenMismatch",
+              messageId: "noSpaceBetweenGenericAndParen",
               *fix(fixer) {
                 yield fixer.replaceTextRange([spaceEndRange - preSpace.length, spaceEndRange], "");
               }
@@ -296,19 +296,19 @@ const spaceBetweenGenericAndParen = createEslintRule({
   }
 });
 
-const RULE_NAME$1 = "space-in-empty-block";
+const RULE_NAME$2 = "space-in-empty-block";
 const spaceInEmptyBlock = createEslintRule({
-  name: RULE_NAME$1,
+  name: RULE_NAME$2,
   meta: {
     type: "suggestion",
     docs: {
-      description: "Spaces in empty block",
+      description: "Disallow spaces in empty block",
       recommended: "error"
     },
     fixable: "code",
     schema: [],
     messages: {
-      spaceInEmptyBlockMismatch: "Space in empty block mismatch"
+      noSpaceInEmptyBlock: "Expected no space in empty block"
     }
   },
   defaultOptions: [],
@@ -331,7 +331,7 @@ const spaceInEmptyBlock = createEslintRule({
                 column: node.loc.end.column - 1 + postSpace.length
               }
             },
-            messageId: "spaceInEmptyBlockMismatch",
+            messageId: "noSpaceInEmptyBlock",
             *fix(fixer) {
               yield fixer.replaceTextRange([node.range[0] + 1, spaceStartRange + postSpace.length], "");
             }
@@ -352,7 +352,7 @@ const spaceInEmptyBlock = createEslintRule({
                 column: node.loc.start.column
               }
             },
-            messageId: "spaceInEmptyBlockMismatch",
+            messageId: "noSpaceInEmptyBlock",
             *fix(fixer) {
               yield fixer.replaceTextRange([spaceEndRange - preSpace.length, spaceEndRange], "");
             }
@@ -363,9 +363,9 @@ const spaceInEmptyBlock = createEslintRule({
   }
 });
 
-const RULE_NAME = "semi-spacing";
+const RULE_NAME$1 = "semi-spacing";
 const semiSpacing = createEslintRule({
-  name: RULE_NAME,
+  name: RULE_NAME$1,
   meta: {
     type: "suggestion",
     docs: {
@@ -375,7 +375,7 @@ const semiSpacing = createEslintRule({
     fixable: "code",
     schema: [],
     messages: {
-      semiSpacingMismatch: "Semi spacing mismatch"
+      noSpaceBeforeSemi: "Expected no space before semicolon"
     }
   },
   defaultOptions: [],
@@ -401,7 +401,7 @@ const semiSpacing = createEslintRule({
               }
             },
             node,
-            messageId: "semiSpacingMismatch",
+            messageId: "noSpaceBeforeSemi",
             *fix(fixer) {
               yield fixer.removeRange([spaceStart, spaceEnd]);
             }
@@ -412,13 +412,63 @@ const semiSpacing = createEslintRule({
   }
 });
 
+const RULE_NAME = "no-inline-type-import";
+const noInlineTypeImport = createEslintRule({
+  name: RULE_NAME,
+  meta: {
+    type: "suggestion",
+    docs: {
+      description: "Disallow inline type import",
+      recommended: "error"
+    },
+    fixable: "code",
+    schema: [],
+    messages: {
+      noInlineTypeImport: "Expected no inline type import"
+    }
+  },
+  defaultOptions: [],
+  create: (context) => {
+    const sourceCode = context.getSourceCode();
+    return {
+      ImportDeclaration: (node) => {
+        const specifiers = node.specifiers;
+        const typeSpecifiers = specifiers.filter((s) => s.type === "ImportSpecifier" && s.importKind === "type");
+        const valueSpecifiers = specifiers.filter((s) => s.type === "ImportSpecifier" && s.importKind === "value");
+        if (typeSpecifiers.length && valueSpecifiers.length) {
+          context.report({
+            loc: node.loc,
+            messageId: "noInlineTypeImport",
+            *fix(fixer) {
+              const typeSpecifiersText = typeSpecifiers.map((s) => sourceCode.getText(s).replace("type ", "")).join(", ");
+              const valueSpecifiersText = valueSpecifiers.map((s) => sourceCode.getText(s)).join(", ");
+              yield fixer.replaceText(node, `import type { ${typeSpecifiersText} } from "${node.source.value}";
+import { ${valueSpecifiersText} } from "${node.source.value}";`);
+            }
+          });
+        } else if (typeSpecifiers.length) {
+          context.report({
+            loc: node.loc,
+            messageId: "noInlineTypeImport",
+            *fix(fixer) {
+              const typeSpecifiersText = typeSpecifiers.map((s) => sourceCode.getText(s).replace("type ", "")).join(", ");
+              yield fixer.replaceText(node, `import type { ${typeSpecifiersText} } from "${node.source.value}";`);
+            }
+          });
+        }
+      }
+    };
+  }
+});
+
 const index = {
   rules: {
     "import-dedupe": importDedupe,
     "generic-spacing": genericSpacing,
     "space-between-generic-and-paren": spaceBetweenGenericAndParen,
     "space-in-empty-block": spaceInEmptyBlock,
-    "semi-spacing": semiSpacing
+    "semi-spacing": semiSpacing,
+    "no-inline-type-import": noInlineTypeImport
   }
 };
 

package/dist/index.d.ts

@@ -4,9 +4,10 @@ declare const _default: {
     rules: {
         "import-dedupe": _typescript_eslint_utils_dist_ts_eslint_Rule.RuleModule<"importDedupe", [], _typescript_eslint_utils_dist_ts_eslint_Rule.RuleListener>;
         "generic-spacing": _typescript_eslint_utils_dist_ts_eslint_Rule.RuleModule<"genericSpacingMismatch", [], _typescript_eslint_utils_dist_ts_eslint_Rule.RuleListener>;
-        "space-between-generic-and-paren": _typescript_eslint_utils_dist_ts_eslint_Rule.RuleModule<"spaceBetweenGenericAndParenMismatch", [], _typescript_eslint_utils_dist_ts_eslint_Rule.RuleListener>;
-        "space-in-empty-block": _typescript_eslint_utils_dist_ts_eslint_Rule.RuleModule<"spaceInEmptyBlockMismatch", [], _typescript_eslint_utils_dist_ts_eslint_Rule.RuleListener>;
-        "semi-spacing": _typescript_eslint_utils_dist_ts_eslint_Rule.RuleModule<"semiSpacingMismatch", [], _typescript_eslint_utils_dist_ts_eslint_Rule.RuleListener>;
+        "space-between-generic-and-paren": _typescript_eslint_utils_dist_ts_eslint_Rule.RuleModule<"noSpaceBetweenGenericAndParen", [], _typescript_eslint_utils_dist_ts_eslint_Rule.RuleListener>;
+        "space-in-empty-block": _typescript_eslint_utils_dist_ts_eslint_Rule.RuleModule<"noSpaceInEmptyBlock", [], _typescript_eslint_utils_dist_ts_eslint_Rule.RuleListener>;
+        "semi-spacing": _typescript_eslint_utils_dist_ts_eslint_Rule.RuleModule<"noSpaceBeforeSemi", [], _typescript_eslint_utils_dist_ts_eslint_Rule.RuleListener>;
+        "no-inline-type-import": _typescript_eslint_utils_dist_ts_eslint_Rule.RuleModule<"noInlineTypeImport", [], _typescript_eslint_utils_dist_ts_eslint_Rule.RuleListener>;
     };
 };
 

package/dist/index.mjs

@@ -2,9 +2,9 @@ import { ESLintUtils } from '@typescript-eslint/utils';
 
 const createEslintRule = ESLintUtils.RuleCreator((ruleName) => ruleName);
 
-const RULE_NAME$4 = "generic-spacing";
+const RULE_NAME$5 = "generic-spacing";
 const genericSpacing = createEslintRule({
-  name: RULE_NAME$4,
+  name: RULE_NAME$5,
   meta: {
     type: "suggestion",
     docs: {
@@ -168,9 +168,9 @@ const genericSpacing = createEslintRule({
   }
 });
 
-const RULE_NAME$3 = "import-dedupe";
+const RULE_NAME$4 = "import-dedupe";
 const importDedupe = createEslintRule({
-  name: RULE_NAME$3,
+  name: RULE_NAME$4,
   meta: {
     type: "problem",
     docs: {
@@ -218,9 +218,9 @@ const importDedupe = createEslintRule({
   }
 });
 
-const RULE_NAME$2 = "space-between-generic-and-paren";
+const RULE_NAME$3 = "space-between-generic-and-paren";
 const spaceBetweenGenericAndParen = createEslintRule({
-  name: RULE_NAME$2,
+  name: RULE_NAME$3,
   meta: {
     type: "suggestion",
     docs: {
@@ -230,7 +230,7 @@ const spaceBetweenGenericAndParen = createEslintRule({
     fixable: "code",
     schema: [],
     messages: {
-      spaceBetweenGenericAndParenMismatch: "Space between generic and paren mismatch"
+      noSpaceBetweenGenericAndParen: "Expected no space between generic type parameters and paren"
     }
   },
   defaultOptions: [],
@@ -259,7 +259,7 @@ const spaceBetweenGenericAndParen = createEslintRule({
               }
             },
             node,
-            messageId: "spaceBetweenGenericAndParenMismatch",
+            messageId: "noSpaceBetweenGenericAndParen",
             *fix(fixer) {
               yield fixer.replaceTextRange([spaceStartRange, spaceStartRange + postSpace.length], "");
             }
@@ -282,7 +282,7 @@ const spaceBetweenGenericAndParen = createEslintRule({
                 }
               },
               node,
-              messageId: "spaceBetweenGenericAndParenMismatch",
+              messageId: "noSpaceBetweenGenericAndParen",
               *fix(fixer) {
                 yield fixer.replaceTextRange([spaceEndRange - preSpace.length, spaceEndRange], "");
               }
@@ -294,19 +294,19 @@ const spaceBetweenGenericAndParen = createEslintRule({
   }
 });
 
-const RULE_NAME$1 = "space-in-empty-block";
+const RULE_NAME$2 = "space-in-empty-block";
 const spaceInEmptyBlock = createEslintRule({
-  name: RULE_NAME$1,
+  name: RULE_NAME$2,
   meta: {
     type: "suggestion",
     docs: {
-      description: "Spaces in empty block",
+      description: "Disallow spaces in empty block",
       recommended: "error"
     },
     fixable: "code",
     schema: [],
     messages: {
-      spaceInEmptyBlockMismatch: "Space in empty block mismatch"
+      noSpaceInEmptyBlock: "Expected no space in empty block"
     }
   },
   defaultOptions: [],
@@ -329,7 +329,7 @@ const spaceInEmptyBlock = createEslintRule({
                 column: node.loc.end.column - 1 + postSpace.length
               }
             },
-            messageId: "spaceInEmptyBlockMismatch",
+            messageId: "noSpaceInEmptyBlock",
             *fix(fixer) {
               yield fixer.replaceTextRange([node.range[0] + 1, spaceStartRange + postSpace.length], "");
             }
@@ -350,7 +350,7 @@ const spaceInEmptyBlock = createEslintRule({
                 column: node.loc.start.column
               }
             },
-            messageId: "spaceInEmptyBlockMismatch",
+            messageId: "noSpaceInEmptyBlock",
             *fix(fixer) {
               yield fixer.replaceTextRange([spaceEndRange - preSpace.length, spaceEndRange], "");
             }
@@ -361,9 +361,9 @@ const spaceInEmptyBlock = createEslintRule({
   }
 });
 
-const RULE_NAME = "semi-spacing";
+const RULE_NAME$1 = "semi-spacing";
 const semiSpacing = createEslintRule({
-  name: RULE_NAME,
+  name: RULE_NAME$1,
   meta: {
     type: "suggestion",
     docs: {
@@ -373,7 +373,7 @@ const semiSpacing = createEslintRule({
     fixable: "code",
     schema: [],
     messages: {
-      semiSpacingMismatch: "Semi spacing mismatch"
+      noSpaceBeforeSemi: "Expected no space before semicolon"
     }
   },
   defaultOptions: [],
@@ -399,7 +399,7 @@ const semiSpacing = createEslintRule({
               }
             },
             node,
-            messageId: "semiSpacingMismatch",
+            messageId: "noSpaceBeforeSemi",
             *fix(fixer) {
               yield fixer.removeRange([spaceStart, spaceEnd]);
             }
@@ -410,13 +410,63 @@ const semiSpacing = createEslintRule({
   }
 });
 
+const RULE_NAME = "no-inline-type-import";
+const noInlineTypeImport = createEslintRule({
+  name: RULE_NAME,
+  meta: {
+    type: "suggestion",
+    docs: {
+      description: "Disallow inline type import",
+      recommended: "error"
+    },
+    fixable: "code",
+    schema: [],
+    messages: {
+      noInlineTypeImport: "Expected no inline type import"
+    }
+  },
+  defaultOptions: [],
+  create: (context) => {
+    const sourceCode = context.getSourceCode();
+    return {
+      ImportDeclaration: (node) => {
+        const specifiers = node.specifiers;
+        const typeSpecifiers = specifiers.filter((s) => s.type === "ImportSpecifier" && s.importKind === "type");
+        const valueSpecifiers = specifiers.filter((s) => s.type === "ImportSpecifier" && s.importKind === "value");
+        if (typeSpecifiers.length && valueSpecifiers.length) {
+          context.report({
+            loc: node.loc,
+            messageId: "noInlineTypeImport",
+            *fix(fixer) {
+              const typeSpecifiersText = typeSpecifiers.map((s) => sourceCode.getText(s).replace("type ", "")).join(", ");
+              const valueSpecifiersText = valueSpecifiers.map((s) => sourceCode.getText(s)).join(", ");
+              yield fixer.replaceText(node, `import type { ${typeSpecifiersText} } from "${node.source.value}";
+import { ${valueSpecifiersText} } from "${node.source.value}";`);
+            }
+          });
+        } else if (typeSpecifiers.length) {
+          context.report({
+            loc: node.loc,
+            messageId: "noInlineTypeImport",
+            *fix(fixer) {
+              const typeSpecifiersText = typeSpecifiers.map((s) => sourceCode.getText(s).replace("type ", "")).join(", ");
+              yield fixer.replaceText(node, `import type { ${typeSpecifiersText} } from "${node.source.value}";`);
+            }
+          });
+        }
+      }
+    };
+  }
+});
+
 const index = {
   rules: {
     "import-dedupe": importDedupe,
     "generic-spacing": genericSpacing,
     "space-between-generic-and-paren": spaceBetweenGenericAndParen,
     "space-in-empty-block": spaceInEmptyBlock,
-    "semi-spacing": semiSpacing
+    "semi-spacing": semiSpacing,
+    "no-inline-type-import": noInlineTypeImport
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@so1ve/eslint-plugin",
-  "version": "0.35.5",
+  "version": "0.36.1",
   "author": "Anthony Fu <anthonyfu117@hotmail.com> (https://github.com/antfu/)",
   "contributors": [
     {