@putout/printer 2.5.0 → 2.7.0

package/ChangeLog

@@ -1,3 +1,14 @@
+2023.06.13, v2.7.0
+
+feature:
+- 7f3fd61 @putout/printer: ObjectPattern: couple levels deep
+- 7922ba6 @putout/printer: ObjectPattern: move out
+
+2023.06.13, v2.6.0
+
+fix:
+- 30e2aa1 @putout/printer: ObjectExpression: used as argument call
+
 2023.06.12, v2.5.0
 
 feature:

package/lib/tokenize/expressions/index.js

@@ -19,7 +19,7 @@ const {NewExpression} = require('./new-expression');
 
 const {ObjectExpression} = require('./object-expression/object-expression');
 const {ObjectProperty} = require('./object-expression/object-property');
-const {ObjectPattern} = require('./object-pattern');
+const {ObjectPattern} = require('./object-pattern/object-pattern');
 
 const {
     ClassProperty,

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

@@ -12,6 +12,7 @@ const {
 } = require('../../is');
 
 const {parseComments} = require('../../comments');
+const {isObjectExpression} = require('@babel/types');
 
 const isBodyOfArrow = (path) => path.parentPath.node.body === path.node;
 const isLogical = (path) => path.get('argument').isLogicalExpression();
@@ -28,9 +29,7 @@ module.exports.ObjectExpression = (path, {print, maybe, indent, write}, semantic
     
     maybe.print(parens, '(');
     print('{');
-    parseComments(path, {
-        write,
-    }, semantics);
+    parseComments(path, {write}, semantics);
     maybe.print.newline(manyLines);
     
     for (const property of properties) {
@@ -85,6 +84,13 @@ const notLastArgInsideCall = (path) => {
     if (!parentPath.isCallExpression())
         return false;
     
+    const {properties} = path.node;
+    
+    for (const property of properties) {
+        if (isObjectExpression(property.value))
+            return false;
+    }
+    
     return path !== parentPath
         .get('arguments')
         .at(-1);

package/lib/tokenize/expressions/{object-pattern.js → object-pattern/object-pattern.js}

@@ -5,17 +5,17 @@ const {
     isObjectPattern,
 } = require('@babel/types');
 
+const {wrongShorthand} = require('./wrong-shortand');
+
 const {
     isForOf,
     isCoupleLines,
     exists,
-} = require('../is');
+} = require('../../is');
 
-const wrongShorthand = ({computed, isAssign, keyPath, valuePath}) => {
-    return !computed && !isAssign && keyPath.node.name !== valuePath.node.name;
-};
+const isTwoLevelsDeep = ({parentPath}) => parentPath.parentPath.parentPath.isObjectProperty();
 
-const isOneParentProperty = ({parentPath}) => parentPath.parentPath.node.properties.length === 1;
+const isOneParentProperty = ({parentPath}) => parentPath.parentPath.node.properties?.length === 1;
 
 module.exports.ObjectPattern = {
     print(path, {indent, print, maybe}) {
@@ -27,7 +27,7 @@ module.exports.ObjectPattern = {
         const is = shouldAddNewline(path);
         const hasObject = n && hasObjectPattern(properties);
         
-        maybe.print(is, '\n');
+        maybe.print.newline(is);
         
         for (const [i, property] of properties.entries()) {
             if (property.isRestElement()) {
@@ -46,7 +46,7 @@ module.exports.ObjectPattern = {
                 computed,
             } = property.node;
             
-            const couple = isCoupleLines(valuePath) && !exists(property.getPrevSibling());
+            const couple = isCoupleLines(valuePath) && !exists(property.getPrevSibling()) && !path.parentPath.isObjectProperty();
             
             maybe.indent(is);
             maybe.print.breakline(couple);
@@ -87,10 +87,10 @@ module.exports.ObjectPattern = {
         if (!path.parentPath.isObjectProperty())
             return false;
         
-        if (isOneParentProperty(path))
-            return true;
+        if (isTwoLevelsDeep(path))
+            return false;
         
-        return false;
+        return isOneParentProperty(path);
     },
     after(path, {print}) {
         print.newline();
@@ -121,13 +121,14 @@ function hasObjectPattern(properties) {
 }
 
 function shouldAddNewline(path) {
+    const {parentPath} = path;
     const properties = path.get('properties');
     const n = properties.length - 1;
     
     if (!isForOf(path) && !path.parentPath.isFunction() && n && checkLength(properties))
         return true;
     
-    if (path.parentPath.isObjectProperty())
+    if (parentPath.isObjectProperty())
         return true;
     
     return false;

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

@@ -0,0 +1,6 @@
+'use strict';
+
+module.exports.wrongShorthand = ({computed, isAssign, keyPath, valuePath}) => {
+    return !computed && !isAssign && keyPath.node.name !== valuePath.node.name;
+};
+

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

@@ -35,9 +35,7 @@ module.exports.BlockStatement = {
             print(element);
         }
         
-        parseComments(path, {
-            write,
-        }, semantics);
+        parseComments(path, {write}, semantics);
         
         indent.dec();
         maybe.indent(body.length);

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

@@ -61,11 +61,7 @@ module.exports.VariableDeclaration = {
                     continue;
                 }
                 
-                parseLeadingComments(next, {
-                    print,
-                    maybe,
-                    indent,
-                }, semantics);
+                parseLeadingComments(next, {print, maybe, indent}, semantics);
             }
         }
         

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

@@ -30,4 +30,3 @@ module.exports.WhileStatement = {
         markAfter(path);
     },
 };
-

package/package.json

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