@rotki/eslint-plugin 1.3.1 → 1.3.2

package/dist/index.mjs

@@ -7,7 +7,7 @@ import { statSync, readFileSync } from 'node:fs';
 import { globSync } from 'tinyglobby';
 import { parse } from 'vue-eslint-parser';
 
-const version = "1.3.1";
+const version = "1.3.2";
 const pkg = {
 	version: version};
 
@@ -538,12 +538,17 @@ const composableRequireCleanup = createEslintRule({
 });
 
 const RULE_NAME$a = "composable-return-readonly";
-const REACTIVE_CREATORS = /* @__PURE__ */ new Set(["ref", "shallowRef", "computed"]);
+const REACTIVE_CREATORS = /* @__PURE__ */ new Set(["ref", "shallowRef"]);
+const READONLY_CREATORS = /* @__PURE__ */ new Set(["computed"]);
+function isReadonlyCall(node) {
+  return node.type === AST_NODE_TYPES.CallExpression && node.callee.type === AST_NODE_TYPES.Identifier && node.callee.name === "readonly" && node.arguments.length === 1 && node.arguments[0].type === AST_NODE_TYPES.Identifier;
+}
 const composableReturnReadonly = createEslintRule({
   create(context) {
     const autofix = context.options[0]?.autofix ?? false;
     const source = getSourceCode(context);
     const reactiveVars = /* @__PURE__ */ new Set();
+    const readonlyVars = /* @__PURE__ */ new Set();
     return {
       ReturnStatement: (node) => {
         if (!getEnclosingComposable(node))
@@ -553,6 +558,20 @@ const composableReturnReadonly = createEslintRule({
         for (const prop of node.argument.properties) {
           if (prop.type !== AST_NODE_TYPES.Property)
             continue;
+          const valueNode = prop.shorthand ? null : prop.value;
+          if (valueNode && isReadonlyCall(valueNode)) {
+            const innerName = valueNode.arguments[0].name;
+            if (readonlyVars.has(innerName)) {
+              const fixFn = (fixer) => fixer.replaceText(valueNode, innerName);
+              context.report({
+                data: { name: innerName },
+                ...autofix ? { fix: fixFn } : { suggest: [{ data: { name: innerName }, fix: fixFn, messageId: "suggestRemoveReadonly" }] },
+                messageId: "unnecessaryReadonly",
+                node: prop
+              });
+              continue;
+            }
+          }
           if (prop.shorthand && prop.key.type === AST_NODE_TYPES.Identifier && reactiveVars.has(prop.key.name)) {
             const keyName = prop.key.name;
             const fixFn = (fixer) => fixer.replaceText(prop, `${keyName}: readonly(${keyName})`);
@@ -579,8 +598,13 @@ const composableReturnReadonly = createEslintRule({
           return;
         if (node.id.type !== AST_NODE_TYPES.Identifier)
           return;
-        if (node.init?.type === AST_NODE_TYPES.CallExpression && node.init.callee.type === AST_NODE_TYPES.Identifier && REACTIVE_CREATORS.has(node.init.callee.name)) {
-          reactiveVars.add(node.id.name);
+        if (node.init?.type === AST_NODE_TYPES.CallExpression && node.init.callee.type === AST_NODE_TYPES.Identifier) {
+          const calleeName = node.init.callee.name;
+          if (REACTIVE_CREATORS.has(calleeName)) {
+            reactiveVars.add(node.id.name);
+          } else if (READONLY_CREATORS.has(calleeName)) {
+            readonlyVars.add(node.id.name);
+          }
         }
       }
     };
@@ -594,7 +618,9 @@ const composableReturnReadonly = createEslintRule({
     fixable: "code",
     hasSuggestions: true,
     messages: {
+      suggestRemoveReadonly: "Remove unnecessary readonly() from '{{ name }}'.",
       suggestWrapReadonly: "Wrap '{{ name }}' with readonly().",
+      unnecessaryReadonly: "Computed ref '{{ name }}' is already readonly and does not need readonly() wrapping.",
       wrapReadonly: "Returned ref '{{ name }}' should be wrapped with readonly()."
     },
     schema: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rotki/eslint-plugin",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "type": "module",
   "license": "AGPL-3.0",
   "bugs": {