@putout/printer 1.78.0 → 1.79.1

package/ChangeLog

@@ -1,3 +1,13 @@
+2023.05.02, v1.79.1
+
+fix:
+- 1d1af3a @putout/printer: chaining
+
+2023.05.02, v1.79.0
+
+feature:
+- c2ff505 @putout/printer: ImportsDeclaration: improve
+
 2023.05.01, v1.78.0
 
 feature:

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

@@ -19,4 +19,3 @@ function shouldPrint(path) {
     
     return path.parentPath.isArrayPattern();
 }
-

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

@@ -4,9 +4,12 @@ const {
     isUnaryExpression,
     isArrowFunctionExpression,
     isLogicalExpression,
+    isIfStatement,
+
 } = require('@babel/types');
 
 const {chain} = require('./chain');
+const {satisfy} = require('../../is');
 
 module.exports.MemberExpression = (path, {print, maybe, traverse}) => {
     const {computed} = path.node;
@@ -56,16 +59,17 @@ module.exports.OptionalMemberExpression = (path, {print}) => {
 
 const isCall = (a) => a.type === 'CallExpression';
 
+const isExcludedFromChain = satisfy([
+    isUnaryExpression,
+    isArrowFunctionExpression,
+    isLogicalExpression,
+    isIfStatement,
+]);
+
 function likeChain(path) {
     const [root, properties] = chain(path);
     
-    if (isUnaryExpression(root))
-        return false;
-    
-    if (isArrowFunctionExpression(root))
-        return false;
-    
-    if (isLogicalExpression(root))
+    if (isExcludedFromChain(root))
         return false;
     
     const calls = properties.filter(isCall);

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

@@ -1,7 +1,11 @@
 'use strict';
 
 const {isIdentifier} = require('@babel/types');
-const {isForOf, isCoupleLines} = require('../is');
+
+const {
+    isForOf,
+    isCoupleLines,
+} = require('../is');
 
 module.exports.ObjectPattern = (path, {indent, print, maybe}) => {
     indent.inc();

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

@@ -0,0 +1,98 @@
+'use strict';
+
+const {markAfter} = require('../../mark');
+const {isLast} = require('../../is');
+const {parseSpecifiers} = require('./parse-specifiers');
+
+module.exports.ImportDeclaration = {
+    print(path, {print, maybe, write, traverse, indent}) {
+        const isType = path.node.importKind === 'type';
+        const specifiers = path.get('specifiers');
+        
+        print('import ');
+        maybe.print(isType, 'type ');
+        
+        let wasSpecifier = false;
+        const n = specifiers.length - 1;
+        
+        const {
+            defaults,
+            namespaces,
+            imports,
+        } = parseSpecifiers(specifiers);
+        
+        for (const spec of defaults) {
+            traverse(spec.get('local'));
+            maybe.write(n, ',');
+            maybe.write.space(n);
+        }
+        
+        for (const spec of namespaces) {
+            print('* as ');
+            print(spec.get('local'));
+        }
+        
+        const importsCount = imports.length - 1;
+        
+        for (const [index, spec] of imports.entries()) {
+            const last = index === importsCount;
+            const notLast = !last;
+            
+            const {
+                imported,
+                local,
+            } = spec.node;
+            
+            indent.inc();
+            
+            maybe.write(!wasSpecifier, '{');
+            maybe.write.breakline(importsCount > 2);
+            
+            wasSpecifier = true;
+            write(imported.name);
+            
+            if (imported.name !== local.name) {
+                write(' as ');
+                write(spec.node.local.name);
+            }
+            
+            if (importsCount < 2 && notLast) {
+                maybe.write(n, ',');
+                maybe.write.space(n);
+            }
+            
+            if (importsCount > 2) {
+                maybe.write(n, ',');
+                maybe.write.newline(index === n);
+            }
+            
+            indent.dec();
+            maybe.write(last, '}');
+        }
+        
+        if (specifiers.length) {
+            print.space();
+            print('from');
+            print.space();
+        }
+        
+        print('__source');
+        print(';');
+        
+        if (!isLast(path))
+            print.newline();
+    },
+    afterIf(path) {
+        if (isLast(path))
+            return false;
+        
+        if (path.getNextSibling().isImportDeclaration())
+            return false;
+        
+        return true;
+    },
+    after(path, {print}) {
+        print.newline();
+        markAfter(path);
+    },
+};

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

@@ -0,0 +1,30 @@
+'use strict';
+
+module.exports.parseSpecifiers = (specifiers) => {
+    const defaults = [];
+    const namespaces = [];
+    const imports = [];
+    
+    for (const spec of specifiers) {
+        if (spec.isImportDefaultSpecifier()) {
+            defaults.push(spec);
+            continue;
+        }
+        
+        if (spec.isImportNamespaceSpecifier()) {
+            namespaces.push(spec);
+            continue;
+        }
+        
+        if (spec.isImportSpecifier()) {
+            imports.push(spec);
+            continue;
+        }
+    }
+    
+    return {
+        defaults,
+        namespaces,
+        imports,
+    };
+};

package/lib/tokenize/statements/index.js

@@ -9,7 +9,7 @@ const {ReturnStatement} = require('./return-statement');
 const TryStatements = require('./try-statements');
 const {DebuggerStatement} = require('./debugger-statement');
 const {ForStatement} = require('./for-statement');
-const importDeclarations = require('./import-declaration');
+const importDeclarations = require('./import-declaration/import-declaration');
 const exportDeclarations = require('./export-declarations');
 const {WhileStatement} = require('./while-statement');
 const {SwitchStatement} = require('./switch-statement');

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

@@ -5,7 +5,6 @@ const {
     isCoupleLines,
     isNewlineBetweenSiblings,
     exists,
-
 } = require('../is');
 
 const {hasPrevNewline} = require('../mark');

package/package.json

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

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

@@ -1,86 +0,0 @@
-'use strict';
-
-const {markAfter} = require('../mark');
-const {isLast} = require('../is');
-
-module.exports.ImportDeclaration = {
-    print(path, {print, maybe, write, traverse, indent}) {
-        const isType = path.node.importKind === 'type';
-        const specifiers = path.get('specifiers');
-        
-        print('import ');
-        maybe.print(isType, 'type ');
-        
-        let wasSpecifier = false;
-        const n = specifiers.length - 1;
-        
-        for (const [index, spec] of specifiers.entries()) {
-            if (spec.isImportDefaultSpecifier()) {
-                traverse(spec.get('local'));
-                maybe.write(n, ',');
-                maybe.write.space(n);
-                continue;
-            }
-            
-            if (spec.isImportNamespaceSpecifier()) {
-                print('* as ');
-                print(spec.get('local'));
-            }
-            
-            if (spec.isImportSpecifier()) {
-                const {
-                    imported,
-                    local,
-                } = spec.node;
-                
-                indent.inc();
-                
-                maybe.write(!wasSpecifier, '{');
-                maybe.write.breakline(n);
-                
-                wasSpecifier = true;
-                write(imported.name);
-                
-                if (imported.name !== local.name) {
-                    write(' as ');
-                    write(spec.node.local.name);
-                }
-                
-                maybe.write(n, ',');
-                indent.dec();
-                maybe.write.newline(n && index === n);
-                maybe.write(index === n, '}');
-                
-                continue;
-            }
-        }
-        
-        if (specifiers.length) {
-            print.space();
-            print('from');
-            print.space();
-        }
-        
-        print('__source');
-        print(';');
-        
-        if (!isLast(path))
-            print.newline();
-    },
-    afterIf(path) {
-        if (isLast(path))
-            return false;
-        
-        if (path
-            .getNextSibling()
-            .isImportDeclaration())
-            return false;
-        
-        return true;
-    },
-    after(path, {print}) {
-        print.newline();
-        markAfter(path);
-    },
-};
-