@putout/printer 11.7.0 → 11.9.0

package/ChangeLog

@@ -1,3 +1,17 @@
+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:
+- 0ed288d @putout/printer: LabeledStatement: nexted
+
 2024.12.17, v11.7.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,7 +86,7 @@ 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;

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/is.js

@@ -12,6 +12,7 @@ const {
     isMemberExpression,
     isArrayExpression,
     isObjectExpression,
+    isLabeledStatement,
 } = types;
 
 const isParentProgram = (path) => path.parentPath?.isProgram();
@@ -124,6 +125,8 @@ module.exports.isNewlineBetweenSiblings = (path) => {
     return startNext - endCurrent > 1;
 };
 
+module.exports.isInsideLabel = ({parentPath}) => isLabeledStatement(parentPath);
+
 module.exports.satisfy = (conditions) => (path) => {
     for (const condition of conditions)
         if (condition(path))

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/expression-statement.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const {isLabeledStatement} = require('@putout/babel').types;
 const {
     isNext,
     isLast,
@@ -11,6 +10,7 @@ const {
     noTrailingComment,
     hasTrailingComment,
     isCoupleLines,
+    isInsideLabel,
 } = require('../is');
 
 const isBeforeElse = (path) => {
@@ -36,8 +36,6 @@ const shouldBreakline = satisfy([
     isStrictMode,
 ]);
 
-const isInsideLabel = ({parentPath}) => isLabeledStatement(parentPath);
-
 module.exports.ExpressionStatement = {
     print(path, {print, maybe, store}) {
         maybe.indent(!isInsideLabel(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/lib/tokenize/statements/labeled-statement/labeled-statement.js

@@ -0,0 +1,11 @@
+'use strict';
+
+const {isInsideLabel} = require('../../is');
+
+module.exports.LabeledStatement = (path, {print, maybe}) => {
+    maybe.indent(!isInsideLabel(path));
+    print('__label');
+    print(':');
+    print.space();
+    print('__body');
+};

package/package.json

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

package/lib/tokenize/statements/labeled-statement/labeled-satement.js

@@ -1,9 +0,0 @@
-'use strict';
-
-module.exports.LabeledStatement = (path, {print, indent}) => {
-    indent();
-    print('__label');
-    print(':');
-    print.space();
-    print('__body');
-};