@putout/printer 1.12.0 → 1.13.1

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.03.29, v1.13.1
+
+feature:
+- d320519 @putout/printer: improve support of nested objects
+
+2023.03.29, v1.13.0
+
+feature:
+- 37cca9d @putout/printer: add support of TypeScript
+
 2023.03.29, v1.12.0
 
 feature:

package/README.md

@@ -20,9 +20,11 @@ npm i @putout/printer
 ```js
 const {print} = require('@putout/printer');
 const {parse} = require('@babel/parser');
-
 const ast = parse('const a = (b, c) => {const d = 5; return a;}');
+
 print(ast);
+
+// returns
 // returns
 `
 const a = (b, c) => {
@@ -30,6 +32,7 @@ const a = (b, c) => {
     return a;
 };
 `;
+
 ```
 
 ## Overrides
@@ -59,8 +62,10 @@ print(ast, {
     },
 });
 
+// returns
 // returns
 'const {a /* [hello world] */= 5} = b;\n';
+
 ```
 
 ## License

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

@@ -1,32 +1,58 @@
 'use strict';
 
+const {round} = Math;
+
 const {isObjectProperty} = require('@babel/types');
 const {isCoupleLines} = require('../is');
-const {entries} = Object;
 const isForOf = ({parentPath}) => parentPath.isForOfStatement();
 const SECOND = 1;
 
-module.exports.ArrayExpression = (path, {print, maybe}) => {
+const isStringAndArray = ([a, b]) => a?.isStringLiteral() && b?.isArrayExpression();
+const isTwoLongStrings = ([a, b]) => {
+    const LONG_STRING = 20;
+    
+    if (!a?.isStringLiteral() || !b?.isStringLiteral())
+        return false;
+    
+    if (a.node.value.length > LONG_STRING)
+        return true;
+    
+    return false;
+};
+
+module.exports.ArrayExpression = (path, {print, maybe, indent}) => {
     const elements = path.get('elements');
-    const elementIsObject = isElementObject(path);
+    const shouldIncreaseIndent = isIncreaseIndent(path);
     
     print('[');
-    maybe.indent.inc(!elementIsObject);
     
-    const isNewLine = !elementIsObject && isNewLineBefore(path, {elements});
+    if (!isTwoLongStrings(elements) && !shouldIncreaseIndent) {
+        indent.inc();
+    }
+    
+    const isNewLine = isNewlineBetweenElements(path, {elements});
     const n = elements.length - 1;
     
     maybe.print(isNewLine && elements.length, '\n');
     
-    for (const [index, element] of entries(elements)) {
+    for (const [index, element] of elements.entries()) {
         maybe.indent(isNewLine);
         print(element);
         maybe.print(isNewLine, ',\n');
         maybe.print(!isNewLine && index < n, ', ');
     }
     
-    maybe.indent.dec(!elementIsObject);
-    maybe.indent(elements.length && isNewLine);
+    if (!isTwoLongStrings(elements))
+        maybe.indent.dec(!shouldIncreaseIndent);
+    
+    if (path.parentPath.isArrayExpression() && isStringAndArray(path.parentPath.get('elements'))) {
+        indent.dec();
+        maybe.indent(elements.length && isNewLine);
+        indent.inc();
+    } else {
+        maybe.indent(elements.length && isNewLine);
+    }
+    
     print(']');
 };
 
@@ -55,7 +81,7 @@ function isParentProperty(path) {
     return path.find(isObjectProperty);
 }
 
-function isElementObject(path) {
+function isIncreaseIndent(path) {
     const elements = path.get('elements');
     
     if (!elements.length)
@@ -84,9 +110,29 @@ function tooLong(path) {
     return false;
 }
 
-function isNewLineBefore(path, {elements}) {
+function isNewlineBetweenElements(path, {elements}) {
+    if (isIncreaseIndent(path))
+        return false;
+    
+    if (isTwoStringsDifferentLength(elements))
+        return false;
+    
+    if (isStringAndArray(elements))
+        return false;
+    
     if (tooLong(path) || isCoupleLines(path) || !isNumbers(elements) && !isForOf(path) && isLastArg(path) && !isParentProperty(path))
         return true;
     
     return false;
 }
+
+function isTwoStringsDifferentLength([a, b]) {
+    if (!a?.isStringLiteral() || !b?.isStringLiteral())
+        return false;
+    
+    const aLength = a.node.value.length;
+    const bLength = b.node.value.length;
+    
+    return round(bLength / aLength) > 2;
+}
+

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

@@ -17,17 +17,12 @@ module.exports.ArrayPattern = (path, {indent, maybe, print}) => {
     
     for (const [index, element] of entries(elements)) {
         maybe.indent(isNewLine);
-        
         print(element);
-        
         maybe.print(isNewLine, ',\n');
         maybe.print(!isNewLine && index < n, ', ');
     }
     
     indent.dec();
-    
     maybe.indent(elements.length && isNewLine);
-    
     print(']');
 };
-

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

@@ -2,7 +2,6 @@
 
 module.exports.AssignmentExpression = (path, {print}) => {
     const {operator} = path.node;
-    
     print('__left');
     print(' ');
     print(operator);

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

@@ -7,4 +7,3 @@ module.exports.AssignmentPattern = (path, {print, maybe}) => {
     print(' = ');
     print('__right');
 };
-

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

@@ -10,4 +10,3 @@ function BinaryExpression(path, {print}) {
     print.space();
     print('__right');
 }
-

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

@@ -16,7 +16,6 @@ const CallExpression = {
     },
     print(path, {indent, print, maybe}) {
         const isParentCall = toLong(path) && path.parentPath.isCallExpression();
-        
         print('__callee');
         
         if (path.node.optional)
@@ -56,7 +55,6 @@ const CallExpression = {
 };
 
 module.exports.OptionalCallExpression = CallExpression;
-
 module.exports.CallExpression = CallExpression;
 
 function isNewLineBefore({parentPath}) {

package/lib/tokenize/expressions/class-declaration.js

@@ -1,10 +1,20 @@
 'use strict';
 
 const {entries} = Object;
+
 module.exports.ClassDeclaration = (path, {maybe, print, indent}) => {
     indent();
     print('class ');
     print('__id');
+    print('__typeParameters');
+    
+    const {node} = path;
+    
+    if (node.implements) {
+        print(' implements ');
+        path.get('implements').forEach(print);
+    }
+    
     print(' {\n');
     indent.inc();
     
@@ -20,4 +30,3 @@ module.exports.ClassDeclaration = (path, {maybe, print, indent}) => {
     indent.dec();
     print('}');
 };
-

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

@@ -11,4 +11,3 @@ module.exports.ConditionalExpression = (path, {print}) => {
     print.space();
     print('__alternate');
 };
-

package/lib/tokenize/expressions/functions.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const {hasPrevNewline} = require('../mark');
-
 const isFirst = (path) => !path.getPrevSibling().node;
 
 module.exports.FunctionExpression = (path, {print, maybe}) => {
@@ -51,7 +50,6 @@ function ArrowFunctionExpression(path, {print, maybe}) {
     print(') => ');
     print('__body');
 }
-
 module.exports.ObjectMethod = (path, {print}) => {
     print('__key');
     print('(');

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

@@ -2,7 +2,6 @@
 
 module.exports.MemberExpression = (path, {print}) => {
     const {computed} = path.node;
-    
     print('__object');
     
     if (computed) {
@@ -22,4 +21,3 @@ module.exports.OptionalMemberExpression = (path, {print}) => {
     print('?.');
     print('__property');
 };
-

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

@@ -6,6 +6,7 @@ module.exports.NewExpression = (path, {indent, print, maybe}) => {
     print('__callee');
     
     const args = path.get('arguments');
+    
     print('(');
     
     const n = args.length - 1;
@@ -17,4 +18,3 @@ module.exports.NewExpression = (path, {indent, print, maybe}) => {
     
     print(')');
 };
-

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

@@ -1,6 +1,7 @@
 'use strict';
 
 const {isCoupleLines} = require('../is');
+
 const isBodyOfArrow = (path) => path.parentPath.node.body === path.node;
 const isLogical = (path) => path.get('argument').isLogicalExpression();
 
@@ -59,6 +60,7 @@ module.exports.ObjectProperty = (path, {print, maybe}) => {
         shorthand,
         computed,
     } = path.node;
+    
     const manyLines = !isOneLine(path.parentPath);
     
     maybe.print(computed, '[');
@@ -88,3 +90,4 @@ function isOneLine(path) {
     
     return isForOf(path);
 }
+

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

@@ -8,8 +8,8 @@ module.exports.ObjectPattern = (path, {indent, print, maybe}) => {
     
     const properties = path.get('properties');
     const n = properties.length - 1;
-    
     const is = !isForOf(path) && !path.parentPath.isFunction() && n && checkLength(properties);
+    
     maybe.print(is, '\n');
     
     for (const [i, property] of properties.entries()) {
@@ -36,6 +36,7 @@ module.exports.ObjectPattern = (path, {indent, print, maybe}) => {
         if (is) {
             print(',');
             print.newline();
+            
             continue;
         }
         
@@ -55,4 +56,3 @@ function checkLength(properties) {
     
     return false;
 }
-

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

@@ -12,4 +12,3 @@ module.exports.SequenceExpression = (path, {maybe, print}) => {
         maybe.print(index < n, ' ');
     }
 };
-

package/lib/tokenize/expressions/spread-element.js

@@ -4,4 +4,3 @@ module.exports.SpreadElement = (path, {print}) => {
     print('...');
     print('__argument');
 };
-

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

@@ -2,11 +2,13 @@
 
 module.exports.UnaryExpression = unaryExpression;
 module.exports.UpdateExpression = unaryExpression;
+
 module.exports.AwaitExpression = (path, {print}) => {
     printUnary(path, 'await', {
         print,
     });
 };
+
 module.exports.YieldExpression = (path, {print}) => {
     printUnary(path, 'yield', {
         print,
@@ -28,19 +30,22 @@ function printUnary(path, name, {print}) {
     print(`${name} `);
     print('__argument');
 }
-
 const isWord = (a) => /delete|typeof/.test(a);
 
 function unaryExpression(path, {print, maybe}) {
-    const {prefix, operator} = path.node;
+    const {
+        prefix,
+        operator,
+    } = path.node;
     
     if (prefix)
         print(operator);
     
-    maybe.print(isWord(operator), ' ');
+    maybe.print(isWord(
+        operator,
+    ), ' ');
     print('__argument');
     
     if (!prefix)
         print(operator);
 }
-

package/lib/tokenize/literals/template-literal.js

@@ -8,6 +8,7 @@ module.exports.TemplateLiteral = (path, {write, traverse}) => {
     
     for (const element of path.node.quasis) {
         write(element.value.raw);
+        
         const exp = expressions[i++];
         
         if (exp) {
@@ -19,4 +20,3 @@ module.exports.TemplateLiteral = (path, {write, traverse}) => {
     
     write('`');
 };
-

package/lib/tokenize/mark.js

@@ -24,7 +24,6 @@ function isMarkedBefore(path) {
 function isMarkedAfter(path) {
     return path[WATER_MARK_AFTER];
 }
-
 module.exports.hasPrevNewline = (path) => {
     return isMarkedAfter(path.getPrevSibling());
 };

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

@@ -4,7 +4,6 @@ const {
     isNext,
     isParentProgram,
     isLast,
-
 } = require('../is');
 
 const isFirstStatement = (path) => path.get('body.0')?.isStatement();

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

@@ -5,4 +5,3 @@ module.exports.DebuggerStatement = (path, {print, indent}) => {
     print('debugger;');
     print.newline();
 };
-

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

@@ -4,4 +4,3 @@ module.exports.ExportNamedDeclaration = (path, {print}) => {
     print('export ');
     print('__declaration');
 };
-

package/lib/tokenize/statements/for-of-statement.js

@@ -48,4 +48,3 @@ module.exports.ForOfStatement = (path, {indent, print, maybe}) => {
         markAfter(path);
     }
 };
-

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

@@ -17,6 +17,7 @@ module.exports.ImportDeclaration = (path, {print, maybe}) => {
             print('{');
             print(spec.get('imported'));
             print('}');
+            
             continue;
         }
     }

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

@@ -8,7 +8,6 @@ module.exports.SwitchStatement = (path, {print, maybe}) => {
     print('(');
     print('__discriminant');
     print(') {');
-    
     print.newline();
     
     const cases = path.get('cases');
@@ -44,4 +43,3 @@ module.exports.SwitchStatement = (path, {print, maybe}) => {
     
     print('}');
 };
-

package/lib/tokenize/statements/try-statements.js

@@ -1,9 +1,9 @@
 'use strict';
 
 const {isNext} = require('../is');
+
 module.exports.TryStatement = (path, {print, maybe}) => {
     const finalizer = path.get('finalizer');
-    
     print('try ');
     print('__block');
     print('__handler');
@@ -34,4 +34,3 @@ module.exports.CatchClause = (path, {print}) => {
     
     print(body);
 };
-

package/lib/tokenize/tokenize.js

@@ -1,14 +1,18 @@
 'use strict';
 
 const fullstore = require('fullstore');
-
 const isObject = (a) => a && typeof a === 'object';
 const babelTraverse = require('@babel/traverse').default;
 const expressions = require('./expressions');
 const statements = require('./statements');
 const literals = require('./literals');
+const typescript = require('./typescript');
 const {TYPES} = require('../types');
-const {maybeFile, maybePlugin} = require('./maybe');
+
+const {
+    maybeFile,
+    maybePlugin,
+} = require('./maybe');
 
 const {
     createDebug,
@@ -32,6 +36,7 @@ const traversers = {
     ...expressions,
     ...statements,
     ...literals,
+    ...typescript,
 };
 
 const GET = '__';
@@ -192,7 +197,6 @@ module.exports.tokenize = (ast, overrides = {}) => {
         parseLeadingComments(path, printer);
         maybePlugin(currentTraverse, path, printer);
         parseTrailingComments(path, printer);
-        
         debug(path.type);
     }
     
@@ -224,4 +228,3 @@ const createPrint = (path, {traverse, write}) => (maybeLine) => {
     
     return write(maybeLine);
 };
-

package/lib/tokenize/typescript/index.js

@@ -0,0 +1,24 @@
+'use strict';
+
+module.exports = {
+    TSTypeParameterDeclaration(path, {print}) {
+        print('<');
+        path.get('params').forEach(print);
+        print('>');
+    },
+    TSTypeParameterInstantiation(path, {print}) {
+        print('<');
+        path.get('params').forEach(print);
+        print('>');
+    },
+    TSTypeReference(path, {print}) {
+        print('__typeName');
+    },
+    TSTypeParameter(path, {print}) {
+        print(path.node.name);
+    },
+    TSExpressionWithTypeArguments(path, {print}) {
+        print('__expression');
+        print('__typeParameters');
+    },
+};

package/lib/types.js

@@ -7,4 +7,3 @@ module.exports.TYPES = {
     INDENT: 'Indent',
     DEBUG: 'Debug',
 };
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.12.0",
+  "version": "1.13.1",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Easiest possible opinionated Babel AST printer made with ❤️  to use in 🐊Putout",