feature: @putout/plugin-apply-template-literals: improve support of newlines

Author: coderaiser

packages/plugin-apply-template-literals/lib/apply-template-literals.js

@@ -6,34 +6,27 @@ const {
     isTemplateLiteral,
 } = types;
 
-module.exports.report = () => `Use template literals instead of binary expressions`;
+module.exports.report = () => `Use template literals ('\`\`') instead of binary expressions ('+')`;
 
-module.exports.filter = ({parentPath}) => {
-    if (isBinaryExpression(parentPath) || isTemplateLiteral(parentPath.parentPath))
-        return false;
-    
-    let is = true;
-    
-    parentPath.traverse({
-        StringLiteral(path) {
-            const {value} = path.node;
-            
-            if (value.includes('\r'))
-                is = false;
-            
-            if (value.includes('\n'))
-                is = false;
-        },
-    });
-    
-    return is;
-};
+module.exports.filter = ({parentPath}) => !(isBinaryExpression(parentPath) || isTemplateLiteral(parentPath.parentPath));
 
 module.exports.replace = () => ({
-    '"__a" + __identifier__b + "__c"': '`__a${__identifier__b}__c`',
-    '"__a" + __b(__args)+ "__c"': '`__a${__b(__args)}__c`',
-    '__identifier__a + "__b" + __identifier__c + __identifier__d': '`${__identifier__a}__b${__identifier__c}${__identifier__d}`',
-    '__identifier__a + "__b"': '`${__identifier__a}__b`',
-    '"__a" + __identifier__b': '`__a${__identifier__b}`',
-    'String(__a) + ".tar.gz"': '`${__a}.tar.gz`',
+    '"__a" + __identifier__b + "__c"': replaceNewlines('`__a${__identifier__b}__c`', ['__a', '__c']),
+    '"__a" + __b(__args) + "__c"': replaceNewlines('`__a${__b(__args)}__c`', ['__a', '__c']),
+    '__identifier__a + "__b" + __identifier__c + __identifier__d': replaceNewlines('`${__identifier__a}__b${__identifier__c}${__identifier__d}`', ['__b']),
+    '__identifier__a + "__b"': replaceNewlines('`${__identifier__a}__b`', ['__b']),
+    '"__a" + __identifier__b': replaceNewlines('`__a${__identifier__b}`', ['__a']),
+    'String(__a) + "__b"': replaceNewlines('`${__a}__b`', ['__b']),
 });
+
+const replaceNewlines = (template, names) => (vars) => {
+    for (const name of names) {
+        const {value} = vars[name];
+        
+        vars[name].value = value
+            .replace('\n', '\\n')
+            .replace('\r', '\\r');
+    }
+    
+    return template;
+};

packages/plugin-apply-template-literals/test/apply-template-literals.js

@@ -10,7 +10,7 @@ const test = createTest(__dirname, {
 });
 
 test('plugin-apply-template-literals: report: binary', (t) => {
-    t.report('binary', `Use template literals instead of binary expressions`);
+    t.report('binary', `Use template literals ('\`\`') instead of binary expressions ('+')`);
     t.end();
 });
 

packages/plugin-apply-template-literals/test/fixture/newline.js

@@ -1,2 +1,8 @@
-process.stdout.write('\r' + percent + '%');
-throw new Error('Could not get published versions\n' + err);
+process.stdout.write(`\r${percent}%`);
+throw new Error(`Could not get published versions\n${err}`);
+
+fn(`\n${name}\n`);
+fn(`\n${fn(name)}\n`);
+fn(`${a}\n${c}${d}`);
+fn(`${a}\n`);
+`${name}\n`;