@putout/printer 11.8.0 → 11.10.0

package/ChangeLog

@@ -1,3 +1,17 @@
+2024.12.18, v11.10.0
+
+feature:
+- 6c06c0c @putout/printer: ExportDeclaration: no specifiers
+
+2024.12.18, v11.9.0
+
+fix:
+- d30419e @putout/printer: LabeledStatement
+
+feature:
+- 20c554a @putout/printer: TSDeclareMethod: comment: indent
+- 7702bf3 @putout/printer: LogicalExpressions: maxLogicalsInOneLine
+
 2024.12.17, v11.8.0
 
 feature:

package/README.md

@@ -96,6 +96,7 @@ print(ast, {
         comments: true,
         maxSpecifiersInOneLine: 2,
         maxElementsInOneLine: 3,
+        maxLogicalsInOneLine: 3,
         maxVariablesInOneLine: 4,
         maxTypesInOneLine: 3,
         maxPropertiesInOneLine: 2,
@@ -177,6 +178,7 @@ if(a>3)console.log('ok');else console.log('not ok');
 Options used to configure logic of output, similar to ESLint rules:
 
 - ✅ `maxElementsInOneLine` - count of `ArrayExpression` and `ArrayPattern` elements placed in one line.
+- ✅ `maxLogicalsInOneLine` - count of `LogicalExpression` elements placed in one line.
 - ✅ `maxVariablesInOneLine` - count of `VariableDeclarators` in one line.
 - ✅ `maxPropertiesInOneLine` - count of `ObjectProperties` in one line.
 - ✅ `maxPropertiesLengthInOneLine` - maximum length of `Object Property`, when violated splits event if `maxPropertiesInOneLine` satisfies;

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

@@ -86,10 +86,14 @@ module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics)
     if (!looksLikeSwitchCase && hasTrailingComment(path.getPrevSibling()))
         return;
     
-    const insideFn = path.parentPath.isFunction() && !path.isTSTypeParameterDeclaration();
+    const insideFn = (path.parentPath.isFunction() || path.parentPath.isTSDeclareMethod()) && !path.isTSTypeParameterDeclaration();
     
     const propIs = isProperty(path);
-    const isIndent = isFirst(path) || !looksLikeSwitchCase && !path.isClassMethod() && !insideFn && !propIs;
+    const isIndent = isFirst(path)
+        || !looksLikeSwitchCase
+        && !path.isClassMethod()
+        && !insideFn
+        && !propIs;
     
     for (const {type, value} of leadingComments) {
         maybe.indent(isIndent);

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

@@ -3,8 +3,8 @@
 const {maybeTypeAnnotation} = require('../../maybe/maybe-type-annotation');
 const isForOf = ({parentPath}) => parentPath.parentPath.parentPath?.isForOfStatement();
 
-module.exports.ArrayPattern = maybeTypeAnnotation((path, {indent, maybe, print}, options) => {
-    const {maxElementsInOneLine} = options;
+module.exports.ArrayPattern = maybeTypeAnnotation((path, {indent, maybe, print}, semantics) => {
+    const {maxElementsInOneLine} = semantics;
     
     print('[');
     

package/lib/tokenize/expressions/logical-expression/chain.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const {
+    isLogicalExpression,
     isReturnStatement,
     isVariableDeclarator,
 } = require('@putout/babel').types;
@@ -26,7 +27,13 @@ function down(current) {
     
     do {
         ++count;
+        const right = current.get('right');
+        
+        if (isLogicalExpression(right))
+            count += down(right)[0];
+        
         current = current.get('left');
+        
         const {operator} = current.node;
         
         if (operator !== '||' && operator !== '&&')

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

@@ -31,7 +31,7 @@ function isNewLine(path, semantics) {
     if (!isRootOk(root))
         return false;
     
-    if (count <= semantics.maxElementsInOneLine)
+    if (count <= semantics.maxLogicalsInOneLine)
         return false;
     
     const {operator} = path.node;

package/lib/tokenize/overrides/overrides.js

@@ -35,6 +35,7 @@ function initSemantics(semantics = {}) {
         maxPropertiesLengthInOneLine: 15,
         maxSpecifiersInOneLine: 2,
         maxElementsInOneLine: 5,
+        maxLogicalsInOneLine: 3,
         maxVariablesInOneLine: 4,
         maxTypesInOneLine: 3,
         trailingComma: true,

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

@@ -35,14 +35,14 @@ module.exports.ExportNamespaceSpecifier = (path, {print}) => {
 };
 
 module.exports.ExportNamedDeclaration = {
-    print(path, {print, traverse, write, indent, maybe}) {
+    print(path, {print, traverse, indent, maybe}) {
         const {exportKind} = path.node;
         const specifiers = path.get('specifiers');
         const {maxOneLineSpecifiers} = options.exports;
         const source = path.get('source');
         
         indent();
-        write('export');
+        print('export');
         
         if (exportKind === 'type' && specifiers.length)
             print(' type');
@@ -61,39 +61,43 @@ module.exports.ExportNamedDeclaration = {
         const n = specifiers.length;
         const isNewline = !exists(source) || n > maxOneLineSpecifiers;
         
-        if (specifiers.length) {
+        if (specifiers && !path.node.declaration) {
             print.space();
-            write('{');
-            indent.inc();
-            maybe.write.newline(isNewline);
+            print('{');
             
-            const lastIndex = n - 1;
-            
-            for (const [i, spec] of specifiers.entries()) {
-                const isType = spec.node.exportKind === 'type';
-                maybe.indent(isNewline);
-                maybe.write(isType, 'type ');
-                traverse(spec);
+            if (specifiers.length) {
+                indent.inc();
+                maybe.print.newline(isNewline);
+                
+                const lastIndex = n - 1;
                 
-                if (i < lastIndex && !isNewline)
-                    write(', ');
+                for (const [i, spec] of specifiers.entries()) {
+                    const isType = spec.node.exportKind === 'type';
+                    maybe.indent(isNewline);
+                    maybe.print(isType, 'type ');
+                    traverse(spec);
+                    
+                    if (i < lastIndex && !isNewline)
+                        print(', ');
+                    
+                    maybe.print(isNewline, ',');
+                    maybe.print.newline(isNewline);
+                }
                 
-                maybe.write(isNewline, ',');
-                maybe.write.newline(isNewline);
+                indent.dec();
+                indent();
             }
             
-            indent.dec();
-            indent();
-            write('}');
+            print('}');
             const source = path.get('source');
             
             if (exists(source)) {
-                write(' from ');
+                print(' from ');
                 traverse(source);
             }
             
-            write(';');
-            maybe.write.newline(isNext(path) || isInsideNamespace(path));
+            print(';');
+            maybe.print.newline(isNext(path) || isInsideNamespace(path));
             
             return;
         }
@@ -115,3 +119,4 @@ module.exports.ExportNamedDeclaration = {
         markAfter(path);
     },
 };
+

package/lib/tokenize/statements/index.js

@@ -21,7 +21,7 @@ const {BreakStatement} = require('./break-statement');
 const {DoWhileStatement} = require('./do-while-statement');
 const {Program} = require('./program/program');
 const {ContinueStatement} = require('./continue-statement');
-const {LabeledStatement} = require('./labeled-statement/labeled-satement');
+const {LabeledStatement} = require('./labeled-statement/labeled-statement');
 
 const {
     ExportNamespaceSpecifier,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "11.8.0",
+  "version": "11.10.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",