@putout/plugin-remove-useless-escape 1.5.0 → 2.1.0

package/README.md

@@ -1,11 +1,9 @@
-# @putout/plugin-remove-useless-escape [![NPM version][NPMIMGURL]][NPMURL] [![Dependency Status][DependencyStatusIMGURL]][DependencyStatusURL]
+# @putout/plugin-remove-useless-escape [![NPM version][NPMIMGURL]][NPMURL]
 
 [NPMIMGURL]: https://img.shields.io/npm/v/@putout/plugin-remove-useless-escape.svg?style=flat&longCache=true
 [NPMURL]: https://npmjs.org/package/@putout/plugin-remove-useless-escape"npm"
-[DependencyStatusURL]: https://david-dm.org/coderaiser/putout?path=packages/plugin-remove-useless-escape
-[DependencyStatusIMGURL]: https://david-dm.org/coderaiser/putout.svg?path=packages/plugin-remove-useless-escape
 
-`putout` plugin adds ability to find and remove useless escape.
+🐊[`Putout`](https://github.com/coderaiser/putout) plugin adds ability to find and remove useless escape.
 
 ## Install
 

package/lib/remove-useless-escape.js

@@ -1,6 +1,14 @@
 'use strict';
 
 const emojiRegex = require('emoji-regex');
+const {
+    types,
+    operator,
+} = require('putout');
+
+const {replaceWith} = operator;
+const {RegExpLiteral} = types;
+const {assign} = Object;
 
 module.exports.report = () => 'Unnecessary escape character';
 
@@ -12,11 +20,20 @@ module.exports.fix = (path) => {
     }
     
     if (path.isRegExpLiteral()) {
-        const {pattern} = path.node;
+        const {pattern, flags} = path.node;
         const unescaped = unescapeRegExp(pattern);
-        path.node.pattern = unescaped;
-        path.node.raw = `/${unescaped}/`;
-        path.node.extra.raw = `/${unescaped}/`;
+        const raw = `/${unescaped}/`;
+        
+        const regExpNode = assign(RegExpLiteral(unescaped, flags), {
+            value: unescaped,
+            raw,
+            extra: {
+                raw,
+                rawValue: unescaped,
+            },
+        });
+        
+        replaceWith(path, regExpNode);
         return;
     }
     
@@ -49,6 +66,9 @@ module.exports.traverse = ({push}) => ({
             
             if (isEscaped(raw))
                 return push(path);
+            
+            if (raw.includes('\\\''))
+                return push(path);
         }
     },
 });
@@ -59,6 +79,7 @@ const match = (a) => a.match(emojiRegex()) || [];
 const hasA = (a) => /\\\^/.test(a);
 const hasDoubleQuote = (a) => createCheckRegExp('"').test(a);
 const hasQuote = (a) => createCheckRegExp(`'`).test(a);
+const hasComa = (a) => createCheckRegExp(',').test(a);
 
 const hasEmoji = (a) => {
     for (const emoji of match(a)) {
@@ -76,6 +97,9 @@ function isEscaped(raw) {
     if (!raw.includes('\\'))
         return false;
     
+    if (raw.includes('\\+') && !raw.includes('\\\\+'))
+        return true;
+    
     if (hasDoubleQuote(raw))
         return true;
     
@@ -85,6 +109,9 @@ function isEscaped(raw) {
     if (hasA(raw))
         return true;
     
+    if (hasComa(raw))
+        return true;
+    
     return false;
 }
 
@@ -93,8 +120,10 @@ const createEncodedRegExp = (a) => RegExp(`\\\\${a}`, 'g');
 function unEscape(raw) {
     raw = raw
         .replace(/\\'/g, `'`)
+        .replace(/\\\+/g, '+')
         .replace(createEncodedRegExp(`"`), '"')
-        .replace(/\\\^/g, '^');
+        .replace(/\\\^/g, '^')
+        .replace(/(\\),/, ',');
     
     for (const emoji of match(raw)) {
         raw = raw.replace(createEncodedRegExp(emoji), emoji);
@@ -104,13 +133,18 @@ function unEscape(raw) {
 }
 
 function unescapeRegExp(raw) {
-    return raw.replace(/\\:/g, ':');
+    return raw
+        .replace(/\\:/g, ':')
+        .replace(/\+\\\//g, '+/')
+        .replace(/\\,/g, ',');
 }
 
+const is = (a) => (b) => b.includes(`\\${a}`) && !b.includes(`\\\\${a}`);
+const isRegExpColon = is(':');
+const isComa = is(',');
+const isRegExpSlash = (a) => a.includes('\\\\\\\\');
+
 function isEscapedRegExp(raw) {
-    const includes = /\\:/.test(raw);
-    const notIncludes = !/\\\\:/.test(raw);
-    
-    return includes && notIncludes;
+    return isRegExpColon(raw) || isRegExpSlash(raw) || isComa(raw);
 }
 

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@putout/plugin-remove-useless-escape",
-  "version": "1.5.0",
+  "version": "2.1.0",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "putout plugin adds ability to find and remove useless escape",
-  "homepage": "http://github.com/coderaiser/putout",
+  "homepage": "https://github.com/coderaiser/putout/tree/master/packages/plugin-remove-useless-escape",
   "main": "lib/remove-useless-escape.js",
   "release": false,
   "tag": false,
@@ -35,20 +35,20 @@
     "escape"
   ],
   "devDependencies": {
-    "@putout/plugin-madrun": "^10.2.0",
-    "@putout/test": "^3.0.0",
+    "@putout/plugin-madrun": "*",
+    "@putout/test": "^4.0.0",
     "c8": "^7.5.0",
-    "eslint": "^8.0.0-beta.0",
+    "eslint": "^8.0.1",
     "eslint-plugin-node": "^11.0.0",
-    "eslint-plugin-putout": "^10.0.0",
+    "eslint-plugin-putout": "^12.0.0",
     "madrun": "^8.0.1"
   },
   "peerDependencies": {
-    "putout": ">=6.2"
+    "putout": ">=22"
   },
   "license": "MIT",
   "engines": {
-    "node": ">=8.3.0"
+    "node": ">=14"
   },
   "publishConfig": {
     "access": "public"