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

package/README.md

@@ -3,7 +3,7 @@
 [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"
 
-`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
 
@@ -21,7 +21,7 @@ npm i @putout/plugin-remove-useless-escape
 }
 ```
 
-## ❌ Incorrect code example
+## ❌ Example of incorrect code
 
 ```js
 const t = 'hello \"world\"';
@@ -30,7 +30,7 @@ const s = `hello \'world\'`;
 const reg = /\w\:/g;
 ```
 
-## ✅ Correct code Example
+## ✅ Example of correct code
 
 ```js
 const t = 'hello "world"';

package/lib/remove-useless-escape.js

@@ -22,10 +22,13 @@ module.exports.fix = (path) => {
     if (path.isRegExpLiteral()) {
         const {pattern, flags} = path.node;
         const unescaped = unescapeRegExp(pattern);
+        const raw = `/${unescaped}/`;
+        
         const regExpNode = assign(RegExpLiteral(unescaped, flags), {
             value: unescaped,
+            raw,
             extra: {
-                raw: `/${unescaped}/`,
+                raw,
                 rawValue: unescaped,
             },
         });
@@ -44,8 +47,9 @@ module.exports.traverse = ({push}) => ({
     'RegExpLiteral'(path) {
         const {raw} = path.node;
         
-        if (isEscapedRegExp(raw))
+        if (isEscapedRegExp(raw)) {
             push(path);
+        }
     },
     '"__"'(path) {
         const {raw} = path.node;
@@ -76,6 +80,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)) {
@@ -93,6 +98,9 @@ function isEscaped(raw) {
     if (!raw.includes('\\'))
         return false;
     
+    if (/\\\//g.test(raw) && !/\\\\\//g.test(raw))
+        return true;
+    
     if (raw.includes('\\+') && !raw.includes('\\\\+'))
         return true;
     
@@ -105,6 +113,9 @@ function isEscaped(raw) {
     if (hasA(raw))
         return true;
     
+    if (hasComa(raw))
+        return true;
+    
     return false;
 }
 
@@ -113,9 +124,11 @@ const createEncodedRegExp = (a) => RegExp(`\\\\${a}`, 'g');
 function unEscape(raw) {
     raw = raw
         .replace(/\\'/g, `'`)
+        .replace(/\\\//g, '/')
         .replace(/\\\+/g, '+')
         .replace(createEncodedRegExp(`"`), '"')
-        .replace(/\\\^/g, '^');
+        .replace(/\\\^/g, '^')
+        .replace(/(\\),/, ',');
     
     for (const emoji of match(raw)) {
         raw = raw.replace(createEncodedRegExp(emoji), emoji);
@@ -127,13 +140,19 @@ function unEscape(raw) {
 function unescapeRegExp(raw) {
     return raw
         .replace(/\\:/g, ':')
-        .replace(/\+\\\//g, '+/');
+        .replace(/\+\\\//g, '+/')
+        .replace(/\\,/g, ',');
 }
 
-const isRegExpColon = (a) => /\\:/.test(a) && !/\\\\:/.test(a);
-const isRegExpSlash = (a) => /\+\\\//.test(a);
+const is = (a) => (b) => b.includes(`\\${a}`) && !b.includes(`\\\\${a}`);
+const isRegExpColon = is(':');
+const isComa = is(',');
+const isRegExpSlash = (a) => a.includes('\\\\\\\\');
 
 function isEscapedRegExp(raw) {
-    return isRegExpColon(raw) || isRegExpSlash(raw);
+    if (raw.includes('\\/'))
+        return false;
+    
+    return isRegExpColon(raw) || isRegExpSlash(raw) || isComa(raw);
 }
 

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@putout/plugin-remove-useless-escape",
-  "version": "1.7.0",
+  "version": "3.0.0",
+  "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "putout plugin adds ability to find and remove useless escape",
-  "homepage": "https://github.com/coderaiser/putout/tree/master/packages/plugin-remove-useless-escape",
+  "homepage": "https://github.com/coderaiser/putout/tree/master/packages/plugin-remove-useless-escape#readme",
   "main": "lib/remove-useless-escape.js",
   "release": false,
   "tag": false,
@@ -35,20 +36,20 @@
     "escape"
   ],
   "devDependencies": {
-    "@putout/plugin-madrun": "^10.2.0",
-    "@putout/test": "^3.0.0",
+    "@putout/plugin-madrun": "*",
+    "@putout/test": "^5.0.0",
     "c8": "^7.5.0",
     "eslint": "^8.0.1",
     "eslint-plugin-node": "^11.0.0",
-    "eslint-plugin-putout": "^11.0.0",
-    "madrun": "^8.0.1"
+    "eslint-plugin-putout": "^14.0.0",
+    "madrun": "^9.0.0"
   },
   "peerDependencies": {
-    "putout": ">=6.2"
+    "putout": ">=25"
   },
   "license": "MIT",
   "engines": {
-    "node": ">=8.3.0"
+    "node": ">=16"
   },
   "publishConfig": {
     "access": "public"