@putout/printer 11.14.0 → 12.1.0

package/ChangeLog

@@ -1,3 +1,15 @@
+2025.01.12, v12.1.0
+
+feature:
+- 93a6b0b @putout/printer: JSX: indent
+
+2025.01.11, v12.0.0
+
+feature:
+- 610ea6e @putout/printer: babel alpha v15
+- 8093095 @putout/printer: CallExpression: typeParameters -> typeArguments
+- d628037 @putout/printer: @putout/babel v3.0.0
+
 2025.01.05, v11.14.0
 
 feature:

package/lib/tokenize/comment/parse-trailing-comments.js

@@ -26,9 +26,7 @@ const isFnParam = (path) => {
     if (!parentPath.isFunction())
         return false;
     
-    return parentPath
-        .get('params')
-        .includes(path);
+    return parentPath.get('params').includes(path);
 };
 
 function isSameLine(path, loc) {

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

@@ -57,9 +57,7 @@ const isSpreadBeforeObject = (a) => {
     if (prev.getPrevSibling().isObjectExpression())
         return false;
     
-    return prev
-        .get('argument')
-        .isCallExpression();
+    return prev.get('argument').isCallExpression();
 };
 
 const isNextSimple = (a) => {

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

@@ -245,13 +245,9 @@ function isNumbers(elements) {
     return false;
 }
 
-function isLastArg({parentPath}) {
-    return !parentPath.isCallExpression();
-}
+const isLastArg = ({parentPath}) => !parentPath.isCallExpression();
 
-function isParentProperty(path) {
-    return path.find(isObjectProperty);
-}
+const isParentProperty = (path) => path.find(isObjectProperty);
 
 module.exports.isIncreaseIndent = isIncreaseIndent;
 function isIncreaseIndent(path) {

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

@@ -18,7 +18,7 @@ const CallExpression = maybeParens((path, {indent, print, maybe, traverse}) => {
     const isParentCall = tooLong(args) && path.parentPath.isCallExpression();
     
     const callee = path.get('callee');
-    const typeParameters = path.get('typeParameters');
+    const typeParameters = path.get('typeArguments');
     
     traverse(callee);
     

package/lib/tokenize/expressions/class/class.js

@@ -44,9 +44,7 @@ const classVisitor = maybeDecorators((path, printer, semantics) => {
     
     if (node.implements) {
         print(' implements ');
-        path
-            .get('implements')
-            .forEach(print);
+        path.get('implements').forEach(print);
     }
     
     print.space();

package/lib/tokenize/expressions/function/params.js

@@ -2,9 +2,7 @@
 
 const {parseComments} = require('../../comment/comment');
 
-function parseParams(path) {
-    return path.get('params');
-}
+const parseParams = (path) => path.get('params');
 
 module.exports.printParams = (path, printer, semantics, customization = {}) => {
     const {extra, typeParameters} = path.node;

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

@@ -83,16 +83,14 @@ const isIfUp = (path) => {
     if (!ifPath)
         return is;
     
-    ifPath
-        .get('test')
-        .traverse({
-            MemberExpression(currentPath) {
-                if (path === currentPath) {
-                    is = true;
-                    path.stop();
-                }
-            },
-        });
+    ifPath.get('test').traverse({
+        MemberExpression(currentPath) {
+            if (path === currentPath) {
+                is = true;
+                path.stop();
+            }
+        },
+    });
     
     return is;
 };

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

@@ -39,7 +39,7 @@ module.exports.NewExpression = {
         const {print, maybe} = printer;
         print('new ');
         print('__callee');
-        print('__typeParameters');
+        print('__typeArguments');
         
         const args = path.get('arguments');
         maybePrintOpenBrace(path, printer, semantics);

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

@@ -142,9 +142,7 @@ const notLastArgInsideCall = (path) => {
     if (isCoupleLines(path))
         return false;
     
-    return path !== parentPath
-        .get('arguments')
-        .at(-1);
+    return path !== parentPath.get('arguments').at(-1);
 };
 
 const ONE_LINE = true;

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

@@ -20,7 +20,7 @@ module.exports.UnaryExpression = unaryExpression;
 module.exports.UpdateExpression = unaryExpression;
 
 module.exports.AwaitExpression = maybeParens((path, {print}) => {
-    printUnary(path, 'await', {
+    printUnary('await', {
         print,
     });
 });
@@ -37,7 +37,7 @@ module.exports.YieldExpression = maybeParens((path, {print, maybe}) => {
 module.exports.ThrowStatement = (path, {print, indent, maybe}) => {
     indent();
     
-    printUnary(path, 'throw', {
+    printUnary('throw', {
         print,
     });
     
@@ -46,7 +46,7 @@ module.exports.ThrowStatement = (path, {print, indent, maybe}) => {
     maybe.print.breakline(isNext(path));
 };
 
-function printUnary(path, name, {print}) {
+function printUnary(name, {print}) {
     print(`${name} `);
     print('__argument');
 }

package/lib/tokenize/is.js

@@ -35,11 +35,17 @@ const isPrev = (path) => {
 const isNextParent = (path) => isNext(path.parentPath);
 const isLast = (path) => isParentProgram(path) && !isNext(path);
 
-module.exports.isNextObject = (a) => a.getNextSibling().isObjectExpression();
-module.exports.isPrevObject = (a) => a.getPrevSibling().isObjectExpression();
+module.exports.isNextObject = (a) => a
+    .getNextSibling()
+    .isObjectExpression();
+module.exports.isPrevObject = (a) => a
+    .getPrevSibling()
+    .isObjectExpression();
 
 module.exports.isFirst = (path) => path.node === path.parentPath.node.body?.[0];
-module.exports.isPrevBody = (path) => path.getPrevSibling().isBlockStatement();
+module.exports.isPrevBody = (path) => path
+    .getPrevSibling()
+    .isBlockStatement();
 module.exports.isNext = isNext;
 module.exports.isPrev = isPrev;
 module.exports.isNextParent = isNextParent;

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

@@ -17,22 +17,16 @@ module.exports.JSXElement = {
             write.newline();
         }
     },
-    print(path, {print, traverse, indent}) {
-        const insideFn = path.parentPath.isArrowFunctionExpression();
-        const insideCall = path.parentPath.parentPath.isCallExpression();
-        
-        if (insideFn && insideCall)
-            indent.inc();
+    print(path, {print, traverse, maybe}) {
+        const needIndent = isNeedIndent(path);
+        maybe.indent.inc(needIndent);
         
         print('__openingElement');
-        path
-            .get('children')
-            .map(traverse);
+        path.get('children').map(traverse);
         
         print('__closingElement');
         
-        if (insideFn && insideCall)
-            indent.dec();
+        maybe.indent.dec(needIndent);
     },
     after(path, {write, indent, maybe}) {
         const {leadingComments} = path.node;
@@ -62,3 +56,16 @@ function condition(path) {
     
     return path.parentPath.isVariableDeclarator();
 }
+
+function isNeedIndent(path) {
+    const attributesCount = path.node.openingElement.attributes.length;
+    
+    if (attributesCount > 3)
+        return false;
+    
+    const insideFn = path.parentPath.isArrowFunctionExpression();
+    const insideJSX = path.parentPath.isJSXElement();
+    const insideCall = path.parentPath.parentPath.isCallExpression();
+    
+    return insideJSX || insideFn && insideCall;
+}

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

@@ -9,9 +9,7 @@ module.exports.JSXFragment = {
     },
     print(path, {print, traverse}) {
         print('__openingFragment');
-        path
-            .get('children')
-            .map(traverse);
+        path.get('children').map(traverse);
         print('__closingFragment');
     },
     after(path, {write, indent}) {

package/lib/tokenize/overrides/overrides.js

@@ -16,32 +16,28 @@ module.exports.parseOverrides = (overrides = {}) => {
     };
 };
 
-function initFormat(format) {
-    return {
-        indent: '    ',
-        newline: '\n',
-        space: ' ',
-        splitter: '\n',
-        quote: `'`,
-        endOfFile: '\n',
-        ...format,
-    };
-}
+const initFormat = (format) => ({
+    indent: '    ',
+    newline: '\n',
+    space: ' ',
+    splitter: '\n',
+    quote: `'`,
+    endOfFile: '\n',
+    ...format,
+});
 
-function initSemantics(semantics = {}) {
-    return {
-        comments: true,
-        maxPropertiesInOneLine: 2,
-        maxPropertiesLengthInOneLine: 15,
-        maxSpecifiersInOneLine: 2,
-        maxElementsInOneLine: 5,
-        maxLogicalsInOneLine: 3,
-        maxVariablesInOneLine: 4,
-        maxTypesInOneLine: 3,
-        trailingComma: true,
-        encodeSingleQuote: true,
-        encodeDoubleQuote: false,
-        ...semantics,
-        roundBraces: parseRoundBraces(semantics),
-    };
-}
+const initSemantics = (semantics = {}) => ({
+    comments: true,
+    maxPropertiesInOneLine: 2,
+    maxPropertiesLengthInOneLine: 15,
+    maxSpecifiersInOneLine: 2,
+    maxElementsInOneLine: 5,
+    maxLogicalsInOneLine: 3,
+    maxVariablesInOneLine: 4,
+    maxTypesInOneLine: 3,
+    trailingComma: true,
+    encodeSingleQuote: true,
+    encodeDoubleQuote: false,
+    ...semantics,
+    roundBraces: parseRoundBraces(semantics),
+});

package/lib/tokenize/statements/program/program.js

@@ -22,9 +22,7 @@ module.exports.Program = (path, printer, semantics) => {
         maybe.write.newline(body.length);
     }
     
-    path
-        .get('body')
-        .forEach(traverse);
+    path.get('body').forEach(traverse);
     
     if (directives.length && !body.length)
         return;

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

@@ -204,7 +204,5 @@ const isNextAssign = (path) => {
     if (parentPath.isBlockStatement() && parentPath.node.body.length < 3)
         return false;
     
-    return nextPath
-        .get('expression')
-        .isAssignmentExpression();
+    return nextPath.get('expression').isAssignmentExpression();
 };

package/lib/tokenize/typescript/enum/ts-enum-declaration.js

@@ -24,7 +24,7 @@ module.exports.TSEnumDeclaration = {
         indent.inc();
         print.newline();
         
-        for (const member of path.get('members')) {
+        for (const member of path.get('body.members')) {
             traverse(member);
             print(',');
             print.newline();

package/lib/tokenize/typescript/index.js

@@ -136,7 +136,7 @@ module.exports = {
     },
     TSInstantiationExpression(path, {print}) {
         print('__expression');
-        print('__typeParameters');
+        print('__typeArguments');
     },
     TSAnyKeyword(path, {write}) {
         write('any');
@@ -165,7 +165,7 @@ module.exports = {
     },
     TSClassImplements(path, {print}) {
         print('__expression');
-        print('__typeParameters');
+        print('__typeArguments');
     },
     TSInterfaceHeritage(path, {print}) {
         print('__expression');

package/lib/tokenize/typescript/interface/ts-interface-declaration.js

@@ -24,9 +24,7 @@ module.exports.TSInterfaceDeclaration = {
         
         if (node.extends) {
             print(' extends ');
-            path
-                .get('extends')
-                .map(print);
+            path.get('extends').map(print);
         }
         
         print('__typeParameters');

package/lib/tokenize/typescript/type/ts-type-alias-declaration.js

@@ -8,8 +8,14 @@ const {
 
 const {markAfter} = require('../../mark');
 const {maybeDeclare} = require('../../maybe/maybe-declare');
-const isNextType = (a) => a.getNextSibling().isTSTypeAliasDeclaration();
-const isNextExport = (a) => a.getNextSibling().isExportDeclaration();
+
+const isNextType = (a) => a
+    .getNextSibling()
+    .isTSTypeAliasDeclaration();
+
+const isNextExport = (a) => a
+    .getNextSibling()
+    .isExportDeclaration();
 
 module.exports.TSTypeAliasDeclaration = {
     beforeIf: (path) => !path.parentPath.isExportDeclaration(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "11.14.0",
+  "version": "12.1.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",
@@ -32,7 +32,7 @@
     "report": "madrun report"
   },
   "dependencies": {
-    "@putout/babel": "^2.0.0",
+    "@putout/babel": "^3.0.0",
     "@putout/compare": "^15.0.2",
     "@putout/operate": "^12.0.0",
     "@putout/operator-json": "^2.0.0",