@putout/plugin-remove-useless-escape 1.3.0 → 1.7.0

package/README.md

@@ -1,9 +1,7 @@
-# @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.
 
@@ -29,6 +27,7 @@ npm i @putout/plugin-remove-useless-escape
 const t = 'hello \"world\"';
 const s1 = `hello \"world\"`;
 const s = `hello \'world\'`;
+const reg = /\w\:/g;
 ```
 
 ## ✅ Correct code Example
@@ -37,6 +36,7 @@ const s = `hello \'world\'`;
 const t = 'hello "world"';
 const s1 = `hello "world"`;
 const s = `hello 'world'`;
+const reg = /\w:/g;
 ```
 
 ## License

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';
 
@@ -11,34 +19,56 @@ module.exports.fix = (path) => {
         return;
     }
     
+    if (path.isRegExpLiteral()) {
+        const {pattern, flags} = path.node;
+        const unescaped = unescapeRegExp(pattern);
+        const regExpNode = assign(RegExpLiteral(unescaped, flags), {
+            value: unescaped,
+            extra: {
+                raw: `/${unescaped}/`,
+                rawValue: unescaped,
+            },
+        });
+        
+        replaceWith(path, regExpNode);
+        return;
+    }
+    
     for (const tmpl of path.node.quasis) {
         const {raw} = tmpl.value;
         tmpl.value.raw = unEscape(raw);
     }
 };
 
-module.exports.traverse = ({push}) => {
-    return {
-        '"__"'(path) {
-            const {raw} = path.node;
+module.exports.traverse = ({push}) => ({
+    'RegExpLiteral'(path) {
+        const {raw} = path.node;
+        
+        if (isEscapedRegExp(raw))
+            push(path);
+    },
+    '"__"'(path) {
+        const {raw} = path.node;
+        
+        if (isEscaped(raw))
+            push(path);
+    },
+    
+    '`__`'(path) {
+        for (const tmpl of path.node.quasis) {
+            const {raw} = tmpl.value;
+            
+            if (hasQuote(raw))
+                return push(path);
             
             if (isEscaped(raw))
-                push(path);
-        },
-        
-        '`__`'(path) {
-            for (const tmpl of path.node.quasis) {
-                const {raw} = tmpl.value;
-                
-                if (hasQuote(raw))
-                    return push(path);
-                
-                if (isEscaped(raw))
-                    return push(path);
-            }
-        },
-    };
-};
+                return push(path);
+            
+            if (raw.includes('\\\''))
+                return push(path);
+        }
+    },
+});
 
 const createCheckRegExp = (a) => RegExp(`^((?!\\\\).)*\\\\${a}.`);
 
@@ -63,6 +93,9 @@ function isEscaped(raw) {
     if (!raw.includes('\\'))
         return false;
     
+    if (raw.includes('\\+') && !raw.includes('\\\\+'))
+        return true;
+    
     if (hasDoubleQuote(raw))
         return true;
     
@@ -80,6 +113,7 @@ const createEncodedRegExp = (a) => RegExp(`\\\\${a}`, 'g');
 function unEscape(raw) {
     raw = raw
         .replace(/\\'/g, `'`)
+        .replace(/\\\+/g, '+')
         .replace(createEncodedRegExp(`"`), '"')
         .replace(/\\\^/g, '^');
     
@@ -90,3 +124,16 @@ function unEscape(raw) {
     return raw;
 }
 
+function unescapeRegExp(raw) {
+    return raw
+        .replace(/\\:/g, ':')
+        .replace(/\+\\\//g, '+/');
+}
+
+const isRegExpColon = (a) => /\\:/.test(a) && !/\\\\:/.test(a);
+const isRegExpSlash = (a) => /\+\\\//.test(a);
+
+function isEscapedRegExp(raw) {
+    return isRegExpColon(raw) || isRegExpSlash(raw);
+}
+

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@putout/plugin-remove-useless-escape",
-  "version": "1.3.0",
+  "version": "1.7.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,12 +35,12 @@
     "escape"
   ],
   "devDependencies": {
-    "@putout/plugin-madrun": "^6.1.2",
+    "@putout/plugin-madrun": "^10.2.0",
     "@putout/test": "^3.0.0",
     "c8": "^7.5.0",
-    "eslint": "^7.0.0",
+    "eslint": "^8.0.1",
     "eslint-plugin-node": "^11.0.0",
-    "eslint-plugin-putout": "^7.0.0",
+    "eslint-plugin-putout": "^11.0.0",
     "madrun": "^8.0.1"
   },
   "peerDependencies": {