@so1ve/eslint-plugin 1.4.0 → 1.5.0

package/dist/index.cjs

@@ -39,7 +39,7 @@ const functionStyle = createEslintRule({
   },
   defaultOptions: [],
   create: (context) => {
-    const sourceCode = context.getSourceCode();
+    const sourceCode = context.sourceCode;
     function getLoneReturnStatement(node) {
       const { body } = node;
       if (body.type !== types.AST_NODE_TYPES.BlockStatement) {
@@ -70,8 +70,8 @@ const functionStyle = createEslintRule({
     }
     const scopeStack = [];
     let haveThisAccess = false;
-    function setupScope() {
-      scopeStack.push(context.getScope());
+    function setupScope(node) {
+      scopeStack.push(sourceCode.getScope(node));
     }
     function clearThisAccess() {
       scopeStack.pop();
@@ -161,8 +161,8 @@ const functionStyle = createEslintRule({
         }
         clearThisAccess();
       },
-      ThisExpression() {
-        haveThisAccess = scopeStack.includes(context.getScope());
+      ThisExpression(node) {
+        haveThisAccess = scopeStack.includes(sourceCode.getScope(node));
       }
     };
   }
@@ -203,7 +203,7 @@ const importDedupe = createEslintRule({
             fix(fixer) {
               const start = n.range[0];
               let end = n.range[1];
-              const nextToken = context.getSourceCode().getTokenAfter(n);
+              const nextToken = context.sourceCode.getTokenAfter(n);
               if (nextToken && nextToken.value === ",") {
                 end = nextToken.range[1];
               }
@@ -239,7 +239,7 @@ const noImportPromisesAs = createEslintRule({
   },
   defaultOptions: [],
   create: (context) => {
-    const sourceCode = context.getSourceCode();
+    const sourceCode = context.sourceCode;
     const { text } = sourceCode;
     return {
       ImportDeclaration(node) {
@@ -292,7 +292,7 @@ const noInlineTypeImport = createEslintRule({
   },
   defaultOptions: [],
   create: (context) => {
-    const sourceCode = context.getSourceCode();
+    const sourceCode = context.sourceCode;
     return {
       ImportDeclaration: (node) => {
         const { specifiers } = node;
@@ -446,7 +446,7 @@ const padAfterLastImport = createEslintRule({
   },
   defaultOptions: [],
   create: (context) => {
-    const sourceCode = context.getSourceCode();
+    const sourceCode = context.sourceCode;
     let lastImportNode = null;
     return {
       ImportDeclaration(node) {
@@ -472,19 +472,19 @@ const padAfterLastImport = createEslintRule({
   }
 });
 
-const RULE_NAME = "use-async-with-await";
-const useAsyncWithAwait = createEslintRule({
+const RULE_NAME = "require-async-with-await";
+const requireAsyncWithAwait = createEslintRule({
   name: RULE_NAME,
   meta: {
     type: "problem",
     docs: {
-      description: "Enforce using async keyword with await.",
+      description: "Require using async keyword with await.",
       recommended: "recommended"
     },
     fixable: "code",
     schema: [],
     messages: {
-      useAsyncWithAwait: "Expect using async keyword with await."
+      requireAsyncWithAwait: "Expect using async keyword with await."
     }
   },
   defaultOptions: [],
@@ -504,17 +504,30 @@ const useAsyncWithAwait = createEslintRule({
       "ArrowFunctionExpression": setupNode,
       "ArrowFunctionExpression:exit": clearNode,
       AwaitExpression() {
-        const closestFunctionNode = functionNodeStack[functionNodeStack.length - 1];
-        if (!closestFunctionNode || closestFunctionNode.async) {
+        const node = functionNodeStack[functionNodeStack.length - 1];
+        if (!node || node.async) {
           return;
         }
-        const node = closestFunctionNode.type === types.TSESTree.AST_NODE_TYPES.FunctionExpression && closestFunctionNode.parent?.type === types.TSESTree.AST_NODE_TYPES.MethodDefinition ? closestFunctionNode.parent : closestFunctionNode;
-        const fixRange = node.type === types.TSESTree.AST_NODE_TYPES.MethodDefinition ? node.key.range : node.range;
-        context.report({
-          node,
-          messageId: "useAsyncWithAwait",
-          fix: (fixer) => fixer.insertTextBeforeRange(fixRange, "async ")
-        });
+        let fixRange;
+        if (node.type === types.TSESTree.AST_NODE_TYPES.ArrowFunctionExpression) {
+          fixRange = node.range;
+        }
+        if (node.type === types.TSESTree.AST_NODE_TYPES.FunctionDeclaration || node.type === types.TSESTree.AST_NODE_TYPES.FunctionExpression) {
+          if (node.parent.type === types.TSESTree.AST_NODE_TYPES.Property || node.parent.type === types.TSESTree.AST_NODE_TYPES.MethodDefinition) {
+            if (node.parent.kind === "method" || node.parent.kind === "init") {
+              fixRange = node.parent.key.range;
+            }
+          } else {
+            fixRange = node.range;
+          }
+        }
+        if (!fixRange) {
+          context.report({
+            node,
+            messageId: "requireAsyncWithAwait",
+            fix: (fixer) => fixer.insertTextBeforeRange(fixRange, "async ")
+          });
+        }
       }
     };
   }
@@ -529,7 +542,7 @@ const index = {
     "no-useless-template-string": noUselessTemplateString,
     "no-import-promises-as": noImportPromisesAs,
     "pad-after-last-import": padAfterLastImport,
-    "use-async-with-await": useAsyncWithAwait
+    "require-async-with-await": requireAsyncWithAwait
   }
 };
 

package/dist/index.d.cts

@@ -1,13 +1,17 @@
+import * as _typescript_eslint_utils_ts_eslint from '@typescript-eslint/utils/ts-eslint';
+
+type MessageIds = "arrow" | "declaration";
+
 declare const _default: {
     rules: {
-        "function-style": any;
-        "import-dedupe": any;
-        "no-inline-type-import": any;
-        "no-negated-comparison": any;
-        "no-useless-template-string": any;
-        "no-import-promises-as": any;
-        "pad-after-last-import": any;
-        "use-async-with-await": any;
+        "function-style": _typescript_eslint_utils_ts_eslint.RuleModule<MessageIds, [], _typescript_eslint_utils_ts_eslint.RuleListener>;
+        "import-dedupe": _typescript_eslint_utils_ts_eslint.RuleModule<"importDedupe", [], _typescript_eslint_utils_ts_eslint.RuleListener>;
+        "no-inline-type-import": _typescript_eslint_utils_ts_eslint.RuleModule<"noInlineTypeImport", [], _typescript_eslint_utils_ts_eslint.RuleListener>;
+        "no-negated-comparison": _typescript_eslint_utils_ts_eslint.RuleModule<"noNegatedComparison", [], _typescript_eslint_utils_ts_eslint.RuleListener>;
+        "no-useless-template-string": _typescript_eslint_utils_ts_eslint.RuleModule<"noUselessTemplateString", [], _typescript_eslint_utils_ts_eslint.RuleListener>;
+        "no-import-promises-as": _typescript_eslint_utils_ts_eslint.RuleModule<"noImportPromisesAs", [], _typescript_eslint_utils_ts_eslint.RuleListener>;
+        "pad-after-last-import": _typescript_eslint_utils_ts_eslint.RuleModule<"padAfterLastImport", [], _typescript_eslint_utils_ts_eslint.RuleListener>;
+        "require-async-with-await": _typescript_eslint_utils_ts_eslint.RuleModule<"requireAsyncWithAwait", [], _typescript_eslint_utils_ts_eslint.RuleListener>;
     };
 };
 

package/dist/index.d.mts

@@ -1,13 +1,17 @@
+import * as _typescript_eslint_utils_ts_eslint from '@typescript-eslint/utils/ts-eslint';
+
+type MessageIds = "arrow" | "declaration";
+
 declare const _default: {
     rules: {
-        "function-style": any;
-        "import-dedupe": any;
-        "no-inline-type-import": any;
-        "no-negated-comparison": any;
-        "no-useless-template-string": any;
-        "no-import-promises-as": any;
-        "pad-after-last-import": any;
-        "use-async-with-await": any;
+        "function-style": _typescript_eslint_utils_ts_eslint.RuleModule<MessageIds, [], _typescript_eslint_utils_ts_eslint.RuleListener>;
+        "import-dedupe": _typescript_eslint_utils_ts_eslint.RuleModule<"importDedupe", [], _typescript_eslint_utils_ts_eslint.RuleListener>;
+        "no-inline-type-import": _typescript_eslint_utils_ts_eslint.RuleModule<"noInlineTypeImport", [], _typescript_eslint_utils_ts_eslint.RuleListener>;
+        "no-negated-comparison": _typescript_eslint_utils_ts_eslint.RuleModule<"noNegatedComparison", [], _typescript_eslint_utils_ts_eslint.RuleListener>;
+        "no-useless-template-string": _typescript_eslint_utils_ts_eslint.RuleModule<"noUselessTemplateString", [], _typescript_eslint_utils_ts_eslint.RuleListener>;
+        "no-import-promises-as": _typescript_eslint_utils_ts_eslint.RuleModule<"noImportPromisesAs", [], _typescript_eslint_utils_ts_eslint.RuleListener>;
+        "pad-after-last-import": _typescript_eslint_utils_ts_eslint.RuleModule<"padAfterLastImport", [], _typescript_eslint_utils_ts_eslint.RuleListener>;
+        "require-async-with-await": _typescript_eslint_utils_ts_eslint.RuleModule<"requireAsyncWithAwait", [], _typescript_eslint_utils_ts_eslint.RuleListener>;
     };
 };
 

package/dist/index.d.ts

@@ -1,13 +1,17 @@
+import * as _typescript_eslint_utils_ts_eslint from '@typescript-eslint/utils/ts-eslint';
+
+type MessageIds = "arrow" | "declaration";
+
 declare const _default: {
     rules: {
-        "function-style": any;
-        "import-dedupe": any;
-        "no-inline-type-import": any;
-        "no-negated-comparison": any;
-        "no-useless-template-string": any;
-        "no-import-promises-as": any;
-        "pad-after-last-import": any;
-        "use-async-with-await": any;
+        "function-style": _typescript_eslint_utils_ts_eslint.RuleModule<MessageIds, [], _typescript_eslint_utils_ts_eslint.RuleListener>;
+        "import-dedupe": _typescript_eslint_utils_ts_eslint.RuleModule<"importDedupe", [], _typescript_eslint_utils_ts_eslint.RuleListener>;
+        "no-inline-type-import": _typescript_eslint_utils_ts_eslint.RuleModule<"noInlineTypeImport", [], _typescript_eslint_utils_ts_eslint.RuleListener>;
+        "no-negated-comparison": _typescript_eslint_utils_ts_eslint.RuleModule<"noNegatedComparison", [], _typescript_eslint_utils_ts_eslint.RuleListener>;
+        "no-useless-template-string": _typescript_eslint_utils_ts_eslint.RuleModule<"noUselessTemplateString", [], _typescript_eslint_utils_ts_eslint.RuleListener>;
+        "no-import-promises-as": _typescript_eslint_utils_ts_eslint.RuleModule<"noImportPromisesAs", [], _typescript_eslint_utils_ts_eslint.RuleListener>;
+        "pad-after-last-import": _typescript_eslint_utils_ts_eslint.RuleModule<"padAfterLastImport", [], _typescript_eslint_utils_ts_eslint.RuleListener>;
+        "require-async-with-await": _typescript_eslint_utils_ts_eslint.RuleModule<"requireAsyncWithAwait", [], _typescript_eslint_utils_ts_eslint.RuleListener>;
     };
 };
 

package/dist/index.mjs

@@ -37,7 +37,7 @@ const functionStyle = createEslintRule({
   },
   defaultOptions: [],
   create: (context) => {
-    const sourceCode = context.getSourceCode();
+    const sourceCode = context.sourceCode;
     function getLoneReturnStatement(node) {
       const { body } = node;
       if (body.type !== AST_NODE_TYPES.BlockStatement) {
@@ -68,8 +68,8 @@ const functionStyle = createEslintRule({
     }
     const scopeStack = [];
     let haveThisAccess = false;
-    function setupScope() {
-      scopeStack.push(context.getScope());
+    function setupScope(node) {
+      scopeStack.push(sourceCode.getScope(node));
     }
     function clearThisAccess() {
       scopeStack.pop();
@@ -159,8 +159,8 @@ const functionStyle = createEslintRule({
         }
         clearThisAccess();
       },
-      ThisExpression() {
-        haveThisAccess = scopeStack.includes(context.getScope());
+      ThisExpression(node) {
+        haveThisAccess = scopeStack.includes(sourceCode.getScope(node));
       }
     };
   }
@@ -201,7 +201,7 @@ const importDedupe = createEslintRule({
             fix(fixer) {
               const start = n.range[0];
               let end = n.range[1];
-              const nextToken = context.getSourceCode().getTokenAfter(n);
+              const nextToken = context.sourceCode.getTokenAfter(n);
               if (nextToken && nextToken.value === ",") {
                 end = nextToken.range[1];
               }
@@ -237,7 +237,7 @@ const noImportPromisesAs = createEslintRule({
   },
   defaultOptions: [],
   create: (context) => {
-    const sourceCode = context.getSourceCode();
+    const sourceCode = context.sourceCode;
     const { text } = sourceCode;
     return {
       ImportDeclaration(node) {
@@ -290,7 +290,7 @@ const noInlineTypeImport = createEslintRule({
   },
   defaultOptions: [],
   create: (context) => {
-    const sourceCode = context.getSourceCode();
+    const sourceCode = context.sourceCode;
     return {
       ImportDeclaration: (node) => {
         const { specifiers } = node;
@@ -444,7 +444,7 @@ const padAfterLastImport = createEslintRule({
   },
   defaultOptions: [],
   create: (context) => {
-    const sourceCode = context.getSourceCode();
+    const sourceCode = context.sourceCode;
     let lastImportNode = null;
     return {
       ImportDeclaration(node) {
@@ -470,19 +470,19 @@ const padAfterLastImport = createEslintRule({
   }
 });
 
-const RULE_NAME = "use-async-with-await";
-const useAsyncWithAwait = createEslintRule({
+const RULE_NAME = "require-async-with-await";
+const requireAsyncWithAwait = createEslintRule({
   name: RULE_NAME,
   meta: {
     type: "problem",
     docs: {
-      description: "Enforce using async keyword with await.",
+      description: "Require using async keyword with await.",
       recommended: "recommended"
     },
     fixable: "code",
     schema: [],
     messages: {
-      useAsyncWithAwait: "Expect using async keyword with await."
+      requireAsyncWithAwait: "Expect using async keyword with await."
     }
   },
   defaultOptions: [],
@@ -502,17 +502,30 @@ const useAsyncWithAwait = createEslintRule({
       "ArrowFunctionExpression": setupNode,
       "ArrowFunctionExpression:exit": clearNode,
       AwaitExpression() {
-        const closestFunctionNode = functionNodeStack[functionNodeStack.length - 1];
-        if (!closestFunctionNode || closestFunctionNode.async) {
+        const node = functionNodeStack[functionNodeStack.length - 1];
+        if (!node || node.async) {
           return;
         }
-        const node = closestFunctionNode.type === TSESTree.AST_NODE_TYPES.FunctionExpression && closestFunctionNode.parent?.type === TSESTree.AST_NODE_TYPES.MethodDefinition ? closestFunctionNode.parent : closestFunctionNode;
-        const fixRange = node.type === TSESTree.AST_NODE_TYPES.MethodDefinition ? node.key.range : node.range;
-        context.report({
-          node,
-          messageId: "useAsyncWithAwait",
-          fix: (fixer) => fixer.insertTextBeforeRange(fixRange, "async ")
-        });
+        let fixRange;
+        if (node.type === TSESTree.AST_NODE_TYPES.ArrowFunctionExpression) {
+          fixRange = node.range;
+        }
+        if (node.type === TSESTree.AST_NODE_TYPES.FunctionDeclaration || node.type === TSESTree.AST_NODE_TYPES.FunctionExpression) {
+          if (node.parent.type === TSESTree.AST_NODE_TYPES.Property || node.parent.type === TSESTree.AST_NODE_TYPES.MethodDefinition) {
+            if (node.parent.kind === "method" || node.parent.kind === "init") {
+              fixRange = node.parent.key.range;
+            }
+          } else {
+            fixRange = node.range;
+          }
+        }
+        if (!fixRange) {
+          context.report({
+            node,
+            messageId: "requireAsyncWithAwait",
+            fix: (fixer) => fixer.insertTextBeforeRange(fixRange, "async ")
+          });
+        }
       }
     };
   }
@@ -527,7 +540,7 @@ const index = {
     "no-useless-template-string": noUselessTemplateString,
     "no-import-promises-as": noImportPromisesAs,
     "pad-after-last-import": padAfterLastImport,
-    "use-async-with-await": useAsyncWithAwait
+    "require-async-with-await": requireAsyncWithAwait
   }
 };
 

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@so1ve/eslint-plugin",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "author": "Ray <i@mk1.io> (https://github.com/so1ve/)",
   "keywords": [
     "eslint",
     "eslint-config",
     "eslint-plugin"
   ],
-  "homepage": "https://github.com/so1ve/eslint-config#readme",
+  "homepage": "https://github.com/so1ve/codestyle-config#readme",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/so1ve/eslint-config.git"
+    "url": "git+https://github.com/so1ve/codestyle-config.git"
   },
   "bugs": {
-    "url": "https://github.com/so1ve/eslint-config/issues"
+    "url": "https://github.com/so1ve/codestyle-config/issues"
   },
   "license": "MIT",
   "main": "./dist/index.cjs",
@@ -26,12 +26,11 @@
     "access": "public"
   },
   "dependencies": {
-    "@typescript-eslint/types": "^6.2.0",
-    "@typescript-eslint/utils": "^6.2.0"
+    "@typescript-eslint/types": "^7.1.0",
+    "@typescript-eslint/utils": "^7.1.0"
   },
   "scripts": {
-    "build": "tsx scripts/build.ts",
-    "build:real": "unbuild",
+    "build": "unbuild",
     "stub": "unbuild --stub",
     "test": "vitest"
   }