@putout/printer 2.21.0 → 2.23.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.06.16, v2.23.0
+
+feature:
+- 8dd9ddf @putout/printer: ArrayExpression: newline
+
+2023.06.16, v2.22.0
+
+feature:
+- f092cf8 @putout/printer: ObjectPattern: add maxPropertiesInOneLine
+
 2023.06.16, v2.21.0
 
 feature:

package/README.md

@@ -87,6 +87,7 @@ write(ast, {
         maxSpecifiersInOneLine: 2,
         maxElementsInOneLine: 3,
         maxVariablesInOneLine: 4,
+        maxPropertiesInOneLine: 2,
     },
     visitors: {
         AssignmentPattern(path, {write}) {

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

@@ -113,10 +113,7 @@ const isForOf = ({parentPath}) => parentPath.isForOfStatement();
 const isStringAndString = ([a, b]) => isStringLiteral(a) && isStringLiteral(b);
 
 const isShortTwoSimplesInsideCall = (path, short) => {
-    const {
-        node,
-        parentPath,
-    } = path;
+    const {node, parentPath} = path;
     
     const {elements} = node;
     const {length} = elements;
@@ -139,7 +136,7 @@ function isOneSimple(path) {
     
     const [first] = elements;
     
-    if (first.isIdentifier() && first.node.name.length < 5)
+    if (first.isIdentifier() && first.node.name.length < 15)
         return true;
     
     if (first.isStringLiteral() && first.node.value.length > 10)

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

@@ -4,10 +4,7 @@ const {isObjectPattern} = require('@babel/types');
 
 module.exports.AssignmentExpression = {
     condition: (path) => {
-        const {
-            left,
-            extra,
-        } = path.node;
+        const {left, extra} = path.node;
         
         if (isObjectPattern(left))
             return true;

package/lib/tokenize/expressions/functions/function-declaration.js

@@ -2,10 +2,7 @@
 
 const {markAfter} = require('../../mark');
 
-const {
-    isNext,
-    isNextParent,
-} = require('../../is');
+const {isNext, isNextParent} = require('../../is');
 
 const {printParams} = require('./params');
 

package/lib/tokenize/expressions/functions/function-expression.js

@@ -6,10 +6,7 @@ const {printParams} = require('./params');
 module.exports.FunctionExpression = (path, {print, maybe, write, traverse}) => {
     const {node} = path;
     
-    const {
-        generator,
-        async,
-    } = node;
+    const {generator, async} = node;
     
     maybe.write(async, 'async ');
     write('function');

package/lib/tokenize/expressions/functions/object-method.js

@@ -16,6 +16,7 @@ module.exports.ObjectMethod = {
             generator,
             computed,
         } = path.node;
+        
         const notMethod = kind !== 'method';
         
         maybe.print(notMethod, `${kind} `);

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

@@ -41,10 +41,7 @@ module.exports.MemberExpression = (path, {print, maybe, traverse}) => {
 };
 
 module.exports.OptionalMemberExpression = (path, {print, maybe}) => {
-    const {
-        computed,
-        optional,
-    } = path.node;
+    const {computed, optional} = path.node;
     
     print('__object');
     

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

@@ -4,10 +4,7 @@ const {isConcatenation} = require('../binary-expression/concatanate');
 const {isOneLine} = require('./object-expression');
 
 module.exports.ObjectProperty = (path, {maybe, traverse, write}) => {
-    const {
-        shorthand,
-        computed,
-    } = path.node;
+    const {shorthand, computed} = path.node;
     
     const key = path.get('key');
     const value = path.get('value');

package/lib/tokenize/expressions/object-pattern/max-properties-in-one-line.js

@@ -0,0 +1,12 @@
+'use strict';
+
+module.exports.checkMaxPropertiesInOneLine = (path, {maxPropertiesInOneLine}) => {
+    const {parentPath} = path;
+    
+    if (parentPath.isObjectProperty())
+        return false;
+    
+    const n = path.node.properties.length;
+    
+    return maxPropertiesInOneLine >= n;
+};

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

@@ -13,18 +13,25 @@ const {
     exists,
 } = require('../../is');
 
+const {checkMaxPropertiesInOneLine} = require('./max-properties-in-one-line');
+
 const isTwoLevelsDeep = ({parentPath}) => parentPath.parentPath.parentPath.isObjectProperty();
 
 const isOneParentProperty = ({parentPath}) => parentPath.parentPath.node.properties?.length === 1;
 
 module.exports.ObjectPattern = {
-    print(path, {indent, print, maybe}) {
+    print(path, {indent, print, maybe}, semantics) {
+        const {maxPropertiesInOneLine} = semantics;
         indent.inc();
         print('{');
         
         const properties = path.get('properties');
         const n = properties.length - 1;
-        const is = shouldAddNewline(path);
+        
+        const is = shouldAddNewline(path, {
+            maxPropertiesInOneLine,
+        });
+        
         const hasObject = n && hasObjectPattern(properties);
         
         maybe.print.newline(is);
@@ -41,10 +48,7 @@ module.exports.ObjectPattern = {
             const keyPath = property.get('key');
             const isAssign = valuePath.isAssignmentPattern();
             
-            const {
-                shorthand,
-                computed,
-            } = property.node;
+            const {shorthand, computed} = property.node;
             
             const couple = isCoupleLines(valuePath) && !exists(property.getPrevSibling()) && !path.parentPath.isObjectProperty();
             
@@ -120,13 +124,19 @@ function hasObjectPattern(properties) {
     return false;
 }
 
-function shouldAddNewline(path) {
+const ONE_LINE = false;
+const COUPLE_LINES = true;
+
+function shouldAddNewline(path, {maxPropertiesInOneLine}) {
     const {parentPath} = path;
     const properties = path.get('properties');
     const n = properties.length - 1;
     
+    if (checkMaxPropertiesInOneLine(path, {maxPropertiesInOneLine}))
+        return ONE_LINE;
+    
     if (!isForOf(path) && !path.parentPath.isFunction() && n && checkLength(properties))
-        return true;
+        return COUPLE_LINES;
     
     return parentPath.isObjectProperty();
 }

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

@@ -1,9 +1,6 @@
 'use strict';
 
-const {
-    isLast,
-    isNext,
-} = require('../is');
+const {isLast, isNext} = require('../is');
 
 module.exports.UnaryExpression = unaryExpression;
 module.exports.UpdateExpression = unaryExpression;
@@ -40,10 +37,7 @@ function printUnary(path, name, {print}) {
 const isWord = (a) => /^(delete|typeof|void)$/.test(a);
 
 function unaryExpression(path, {maybe, traverse}) {
-    const {
-        prefix,
-        operator,
-    } = path.node;
+    const {prefix, operator} = path.node;
     
     const argPath = path.get('argument');
     

package/lib/tokenize/literals/index.js

@@ -20,10 +20,7 @@ module.exports = {
         write(path.node.value);
     },
     StringLiteral(path, {write}) {
-        const {
-            raw,
-            value,
-        } = path.node;
+        const {raw, value} = path.node;
         
         write(raw || `'${value}'`);
     },
@@ -31,10 +28,7 @@ module.exports = {
         const {node} = path;
         const parenthesized = node.extra?.parenthesized;
         
-        const {
-            name,
-            optional,
-        } = node;
+        const {name, optional} = node;
         
         maybe.write(parenthesized, '(');
         write(name);

package/lib/tokenize/overrides.js

@@ -29,6 +29,7 @@ function initFormat(format) {
 function initSemantics(semantics = {}) {
     return {
         comments: true,
+        maxPropertiesInOneLine: 2,
         maxSpecifiersInOneLine: 2,
         maxElementsInOneLine: 5,
         maxVariablesInOneLine: 4,

package/lib/tokenize/statements/break-statement.js

@@ -1,9 +1,6 @@
 'use strict';
 
-const {
-    isParentBlock,
-    isNextParent,
-} = require('../is');
+const {isParentBlock, isNextParent} = require('../is');
 
 const insideCase = (path) => path.parentPath.isSwitchCase();
 

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

@@ -7,10 +7,7 @@ const {
     isLast,
 } = require('../../is');
 
-const {
-    markAfter,
-    isMarkedAfter,
-} = require('../../mark');
+const {markAfter, isMarkedAfter} = require('../../mark');
 
 const {isExportNamespaceSpecifier} = require('@babel/types');
 
@@ -23,10 +20,7 @@ const options = {
 };
 
 module.exports.ExportSpecifier = (path, {print}) => {
-    const {
-        local,
-        exported,
-    } = path.node;
+    const {local, exported} = path.node;
     
     print('__local');
     

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

@@ -2,10 +2,7 @@
 
 const {markAfter} = require('../../mark');
 
-const {
-    isLast,
-    isNext,
-} = require('../../is');
+const {isLast, isNext} = require('../../is');
 
 const {parseImportSpecifiers} = require('parse-import-specifiers');
 
@@ -53,10 +50,7 @@ module.exports.ImportDeclaration = {
             const last = index === importsCount;
             const notLast = !last;
             
-            const {
-                imported,
-                local,
-            } = spec.node;
+            const {imported, local} = spec.node;
             
             indent.inc();
             

package/lib/tokenize/tokenize.js

@@ -17,10 +17,7 @@ const {
     maybeThrow,
 } = require('./maybe');
 
-const {
-    createDebug,
-    createLog,
-} = require('./debug');
+const {createDebug, createLog} = require('./debug');
 
 const {
     maybeMarkAfter,

package/lib/tokenize/typescript/ts-mapped-type.js

@@ -1,10 +1,7 @@
 'use strict';
 
 module.exports.TSMappedType = (path, {print, write, indent, maybe}) => {
-    const {
-        readonly,
-        optional,
-    } = path.node;
+    const {readonly, optional} = path.node;
     
     write('{');
     write.newline();

package/package.json

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