@putout/plugin-putout 23.2.0 → 23.3.0

package/lib/apply-fixture-name-to-message/index.js

@@ -57,7 +57,7 @@ const check = ({__a}, path) => {
     const regEnd = RegExp(`: ${name}$`);
     const regMiddle = RegExp(`: ${name}: .*`);
     
-    return !(regEnd.test(value) || regMiddle.test(value));
+    return !regEnd.test(value) && !regMiddle.test(value);
 };
 
 const transform = ({__a}, path) => {

package/lib/check-match/index.js

@@ -11,6 +11,7 @@ const {isStringLiteral} = types;
 
 const PATTERN_MATCH = 'module.exports.match = () => __object';
 const PATTERN_REPLACE = 'module.exports.replace = () => __object';
+const PATTERN_REPLACE_RETURN = 'module.exports.replace = (__args) => __body';
 
 module.exports.report = () => `☝️ Looks like 'match()' template absent in 'replace()'`;
 
@@ -20,27 +21,19 @@ module.exports.replace = () => ({
 
 module.exports.match = () => ({
     [PATTERN_MATCH]: ({__object}, path) => {
-        const namesMatch = [];
-        
-        for (const prop of __object.properties) {
-            if (!isStringLiteral(prop.key))
-                continue;
-            
-            namesMatch.push(prop.key.value);
-        }
-        
+        const namesMatch = getNames(__object);
         const namesReplace = [];
         
         traverse(path.parentPath.parentPath, {
+            [PATTERN_REPLACE_RETURN]: (path) => {
+                const {__body} = getTemplateValues(path, PATTERN_REPLACE_RETURN);
+                const object = __body.body.at(-1).argument;
+                
+                namesReplace.push(...getNames(object));
+            },
             [PATTERN_REPLACE]: (path) => {
                 const {__object} = getTemplateValues(path, PATTERN_REPLACE);
-                
-                for (const prop of __object.properties) {
-                    if (!isStringLiteral(prop.key))
-                        continue;
-                    
-                    namesReplace.push(prop.key.value);
-                }
+                namesReplace.push(...getNames(__object));
             },
         });
         
@@ -52,3 +45,16 @@ module.exports.match = () => ({
         return false;
     },
 });
+
+function getNames({properties}) {
+    const names = [];
+    
+    for (const prop of properties) {
+        if (!isStringLiteral(prop.key))
+            continue;
+        
+        names.push(prop.key.value);
+    }
+    
+    return names;
+}

package/lib/simplify-replace-template/index.js

@@ -8,7 +8,7 @@ const parentNodesList = [
     'export const replace = __',
 ];
 
-module.exports.report = () => `Simplify replce template`;
+module.exports.report = () => `Simplify replace template`;
 
 module.exports.fix = (path) => {
     const {body} = path.node;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-putout",
-  "version": "23.2.0",
+  "version": "23.3.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin helps with plugins development",