@putout/printer 1.28.0 → 1.30.0

package/ChangeLog

@@ -1,3 +1,15 @@
+2023.04.10, v1.30.0
+
+feature:
+- 27b22b3 @putout/printer: add support of JSXElement
+
+2023.04.07, v1.29.0
+
+feature:
+- b1dfcf3 @putout/printer: ObjectPattern: improve support of not ObjectProperty value !== Identifier
+- 53a44db @putout/printer: improve chaining support
+- a552062 @putout/printer: newlines
+
 2023.04.07, v1.28.0
 
 feature:

package/lib/tokenize/debug.js

@@ -1,15 +1,16 @@
 'use strict';
 
 const {stringify} = JSON;
-
 const {TYPES} = require('../types');
 const toSnakeCase = require('just-snake-case');
+
 const {
     LOG,
     LOG_ALL,
     LOG_TOKENS,
     DEBUG,
 } = process.env;
+
 const {codeFrameColumns} = require('@babel/code-frame');
 
 module.exports.createDebug = (tokens) => (a) => {
@@ -24,9 +25,13 @@ module.exports.createDebug = (tokens) => (a) => {
 
 module.exports.createLog = ({newline = '\n', store = createStore()} = {}) => ({type, value}) => {
     if (LOG_TOKENS) {
-        console.log(codeFrameColumns(stringify({type, value}), {}, {
+        console.log(codeFrameColumns(stringify({
+            type,
+            value,
+        }), {}, {
             highlightCode: true,
         }));
+        
         return;
     }
     
@@ -34,6 +39,7 @@ module.exports.createLog = ({newline = '\n', store = createStore()} = {}) => ({t
         console.log(codeFrameColumns(value, {}, {
             highlightCode: true,
         }));
+        
         return;
     }
     
@@ -42,6 +48,7 @@ module.exports.createLog = ({newline = '\n', store = createStore()} = {}) => ({t
             console.log(codeFrameColumns(store(), {}, {
                 highlightCode: true,
             }));
+            
             return;
         }
         
@@ -61,9 +68,9 @@ function createStore() {
         }
         
         const result = chunks.join('');
+        
         chunks = [];
         
         return result;
     };
 }
-

package/lib/tokenize/expressions/array-expression.js

@@ -200,11 +200,8 @@ function isTwoStringsDifferentLength(strings) {
     if (!a?.isStringLiteral() || !b?.isStringLiteral())
         return false;
     
-    const aLength = a
-        .node.value.length;
-    
-    const bLength = b
-        .node.value.length;
+    const aLength = a.node.value.length;
+    const bLength = b.node.value.length;
     
     return round(bLength / aLength) > 2;
 }

package/lib/tokenize/expressions/call-expression.js

@@ -35,8 +35,7 @@ const CallExpression = {
         
         if (isParentCall) {
             indent.dec();
-            print.newline();
-            print.indent();
+            print.breakline();
         }
         
         print(')');

package/lib/tokenize/expressions/member-expressions.js

@@ -4,6 +4,7 @@ const {
     isIfStatement,
     isIdentifier,
     isThisExpression,
+    isUnaryExpression,
 } = require('@babel/types');
 
 const {
@@ -23,7 +24,7 @@ module.exports.MemberExpression = (path, {print, indent, maybe}) => {
         return;
     }
     
-    const isChain = looksLikeChain(path);
+    const isChain = isLooksLikeChain(path);
     maybe.indent.inc(isChain);
     
     if (isChain) {
@@ -52,7 +53,7 @@ module.exports.OptionalMemberExpression = (path, {print}) => {
     print('__property');
 };
 
-function looksLikeChain(path) {
+function isLooksLikeChain(path) {
     const {parentPath} = path;
     
     if (parentPath.parentPath.isStatement() && !parentPath.parentPath.isExpressionStatement())
@@ -61,6 +62,9 @@ function looksLikeChain(path) {
     if (path.find(isIfStatement))
         return false;
     
+    if (path.find(isUnaryExpression))
+        return false;
+    
     const isMember = ({parentPath}) => parentPath.parentPath.isMemberExpression();
     const isExpression = ({parentPath}) => parentPath.parentPath.isExpressionStatement();
     const itMember = isMember(path);
@@ -69,9 +73,6 @@ function looksLikeChain(path) {
     if (parentPath.isLiteral())
         return false;
     
-    if (parentPath.isUnaryExpression())
-        return false;
-    
     if (!itMember && !path.parentPath.isExpressionStatement() && !parentPath.isCallExpression())
         return false;
     
@@ -81,7 +82,10 @@ function looksLikeChain(path) {
     if (parentPath.get('callee') !== path)
         return false;
     
-    if (compare(parentPath, '__a.__b(__args);') && !itMember && !itExpression)
+    if (compare(path.parentPath.parentPath, '(__args) => __b.__c(__args).__d()'))
+        return false;
+    
+    if (compare(parentPath, '__a.__b(__args);') && !itExpression && !itMember)
         return false;
     
     if (compare(parentPath, '__a.__b.__c(__args)') && !itMember)
@@ -90,6 +94,9 @@ function looksLikeChain(path) {
     if (compare(parentPath, '__a.__b.__c = __d'))
         return false;
     
+    if (compare(parentPath, '(__args) => __a.__b(__args).__c'))
+        return false;
+    
     const {__a, __b} = getTemplateValues(parentPath, '__a.__b(__args)');
     const aType = __a?.type;
     const bType = __b?.type;

package/lib/tokenize/expressions/object-expression.js

@@ -2,15 +2,10 @@
 
 const {isCoupleLines} = require('../is');
 const {isFunction} = require('@babel/types');
-
-const isBodyOfArrow = (path) => path
-    .parentPath.node.body === path.node;
-const isLogical = (path) => path
-    .get('argument').isLogicalExpression();
-const isValue = (path) => path
-    .get('properties.0.value').node;
-const isIf = (path) => path
-    .parentPath.parentPath.isIfStatement();
+const isBodyOfArrow = (path) => path.parentPath.node.body === path.node;
+const isLogical = (path) => path.get('argument').isLogicalExpression();
+const isValue = (path) => path.get('properties.0.value').node;
+const isIf = (path) => path.parentPath.parentPath.isIfStatement();
 const isParentExpression = (path) => path.parentPath.isExpressionStatement();
 
 const isForOf = (path) => {
@@ -67,8 +62,7 @@ function shouldAddNewline(path) {
     if (!path.parentPath.isLogicalExpression())
         return false;
     
-    return path
-        .parentPath.parentPath.isSpreadElement();
+    return path.parentPath.parentPath.isSpreadElement();
 }
 module.exports.ObjectProperty = (path, {print, maybe}) => {
     const {
@@ -123,4 +117,3 @@ function isParens(path) {
     
     return false;
 }
-

package/lib/tokenize/expressions/object-pattern.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const {isIdentifier} = require('@babel/types');
 const isForOf = (path) => path.parentPath?.parentPath?.parentPath?.isForOfStatement();
 
 module.exports.ObjectPattern = (path, {indent, print, maybe}) => {
@@ -51,7 +52,12 @@ module.exports.ObjectPattern = (path, {indent, print, maybe}) => {
 
 function checkLength(properties) {
     for (const prop of properties) {
-        if (prop.node.value.name.length > 4)
+        const {value} = prop.node;
+        
+        if (!isIdentifier(value))
+            continue;
+        
+        if (value.name.length > 4)
             return true;
     }
     

package/lib/tokenize/is.js

@@ -1,10 +1,12 @@
 'use strict';
 
 const {isMarkedAfter} = require('./mark');
+
 const {
     isStringLiteral,
     isIdentifier,
 } = require('@babel/types');
+
 const isParentProgram = (path) => path.parentPath?.isProgram();
 const isParentBlock = (path) => path.parentPath.isBlockStatement();
 
@@ -44,5 +46,4 @@ function isCoupleLines(path) {
 function isNextCoupleLines(path) {
     return isCoupleLines(path.getNextSibling());
 }
-
 module.exports.isStringAndIdentifier = ([a, b]) => isStringLiteral(a) && isIdentifier(b);

package/lib/tokenize/jsx/index.js

@@ -0,0 +1,23 @@
+'use strict';
+
+const {JSXElement} = require('./jsx-element');
+
+module.exports = {
+    JSXElement,
+    JSXOpeningElement(path, {print}) {
+        print('<');
+        print('__name');
+        print('>');
+    },
+    JSXIdentifier(path, {write}) {
+        write(path.node.name);
+    },
+    JSXText(path, {write}) {
+        write(path.node.value);
+    },
+    JSXClosingElement(path, {print}) {
+        print('</');
+        print('__name');
+        print('>');
+    },
+};

package/lib/tokenize/jsx/jsx-element.js

@@ -0,0 +1,25 @@
+'use strict';
+
+module.exports.JSXElement = {
+    condition,
+    before(path, {write, indent}) {
+        write('(');
+        write.breakline();
+        indent();
+        indent.inc();
+    },
+    print(path, {print, traverse}) {
+        print('__openingElement');
+        path.get('children').map(traverse);
+        print('__closingElement');
+    },
+    after(path, {write, indent}) {
+        indent.dec();
+        write.breakline();
+        write(')');
+    },
+};
+
+function condition(path) {
+    return path.parentPath.isReturnStatement();
+}

package/lib/tokenize/maybe.js

@@ -27,10 +27,11 @@ function objectPlugin(plugin, path, printer) {
     const {
         print,
         split,
+        condition,
         before = split,
-        beforeIf,
+        beforeIf = condition,
         after = split,
-        afterIf,
+        afterIf = condition,
     } = plugin;
     
     if (beforeIf?.(path, printer)) {

package/lib/tokenize/statements/for-of-statement.js

@@ -35,9 +35,7 @@ module.exports.ForOfStatement = {
             indent.inc();
             print.newline();
             traverse(bodyPath);
-            
             maybe.markAfter(isMarkedAfter(bodyPath), path);
-            
             indent.dec();
             maybe.print.newline(isNext(path));
             

package/lib/tokenize/statements/index.js

@@ -32,7 +32,11 @@ module.exports = {
     DebuggerStatement,
     Program(path, {print}) {
         print('__interpreter');
-        path.get('body').forEach(print);
+        
+        path
+            .get('body')
+            .forEach(print);
+        
         print.newline();
     },
     EmptyStatement(path, {write}) {

package/lib/tokenize/statements/variable-declaration.js

@@ -99,5 +99,6 @@ const isNextAssign = (path) => {
     if (!nextPath.isExpressionStatement())
         return false;
     
-    return nextPath.get('expression').isAssignmentExpression();
+    return nextPath
+        .get('expression').isAssignmentExpression();
 };

package/lib/tokenize/tokenize.js

@@ -8,6 +8,7 @@ const expressions = require('./expressions');
 const statements = require('./statements');
 const literals = require('./literals');
 const typescript = require('./typescript');
+const jsx = require('./jsx');
 const {TYPES} = require('../types');
 
 const {
@@ -38,6 +39,7 @@ const traversers = {
     ...statements,
     ...literals,
     ...typescript,
+    ...jsx,
 };
 
 const GET = '__';

package/lib/tokenize/typescript/index.js

@@ -3,12 +3,20 @@
 module.exports = {
     TSTypeParameterDeclaration(path, {print}) {
         print('<');
-        path.get('params').forEach(print);
+        
+        path
+            .get('params')
+            .forEach(print);
+        
         print('>');
     },
     TSTypeParameterInstantiation(path, {print}) {
         print('<');
-        path.get('params').forEach(print);
+        
+        path
+            .get('params')
+            .forEach(print);
+        
         print('>');
     },
     TSTypeReference(path, {print}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.28.0",
+  "version": "1.30.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Easiest possible opinionated Babel AST printer made with ❤️  to use in 🐊Putout",