@putout/printer 2.6.0 → 2.8.0

package/ChangeLog

@@ -1,3 +1,14 @@
+2023.06.13, v2.8.0
+
+feature:
+- 93b580e @putout/printer: improve node support
+
+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:

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-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,5 @@
+'use strict';
+
+module.exports.wrongShorthand = ({computed, isAssign, keyPath, valuePath}) => {
+    return !computed && !isAssign && keyPath.node.name !== valuePath.node.name;
+};

package/lib/tokenize/maybe/index.js

@@ -9,6 +9,7 @@ const {
     File,
     ExpressionStatement,
     Program,
+    isStatement,
 } = require('@babel/types');
 
 const isFn = (a) => typeof a === 'function';
@@ -23,8 +24,10 @@ module.exports.maybeThrow = (a, path, b) => {
     }));
 };
 
+const maybeStatement = (ast) => isStatement(ast) ? ast : ExpressionStatement(ast);
+
 const maybeProgram = (ast) => isProgram(ast) ? ast : Program([
-    ExpressionStatement(ast),
+    maybeStatement(ast),
 ]);
 
 module.exports.maybeFile = (ast) => isFile(ast) ? ast : File(maybeProgram(ast));

package/package.json

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