@putout/printer 11.9.0 → 11.10.1

package/ChangeLog

@@ -1,3 +1,13 @@
+2024.12.19, v11.10.1
+
+feature:
+- 6589deb @putout/printer: @putout/plugin-printer v4.0.0
+
+2024.12.18, v11.10.0
+
+feature:
+- 6c06c0c @putout/printer: ExportDeclaration: no specifiers
+
 2024.12.18, v11.9.0
 
 fix:

package/lib/json.js

@@ -1,10 +1,10 @@
 'use strict';
 
+const {types} = require('@putout/babel');
 const {
     isCallExpression,
     isIdentifier,
-} = require('@putout/babel').types;
-
+} = types;
 const {isJSON} = require('@putout/operator-json');
 
 module.exports.maybeJSON = (ast, overrides) => {

package/lib/tokenize/comment/parse-leading-comments.js

@@ -89,7 +89,11 @@ module.exports.parseLeadingComments = (path, {print, maybe, indent}, semantics)
     const insideFn = (path.parentPath.isFunction() || path.parentPath.isTSDeclareMethod()) && !path.isTSTypeParameterDeclaration();
     
     const propIs = isProperty(path);
-    const isIndent = isFirst(path) || !looksLikeSwitchCase && !path.isClassMethod() && !insideFn && !propIs;
+    const isIndent = isFirst(path)
+        || !looksLikeSwitchCase
+        && !path.isClassMethod()
+        && !insideFn
+        && !propIs;
     
     for (const {type, value} of leadingComments) {
         maybe.indent(isIndent);

package/lib/tokenize/comment/parse-trailing-comments.js

@@ -1,10 +1,10 @@
 'use strict';
 
+const {types} = require('@putout/babel');
 const {
     isDecorator,
     isMemberExpression,
-} = require('@putout/babel').types;
-
+} = types;
 const {
     isLast,
     isCoupleLines,

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

@@ -1,7 +1,7 @@
 'use strict';
 
 const {isSimple} = require('@putout/operate');
-
+const {types} = require('@putout/babel');
 const {
     isObjectExpression,
     isArrayExpression,
@@ -12,7 +12,7 @@ const {
     isNullLiteral,
     isStringLiteral,
     isSpreadElement,
-} = require('@putout/babel').types;
+} = types;
 
 const {
     isStringAndMember,

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

@@ -5,10 +5,11 @@ const {
     maybePrintRightBrace,
 } = require('./maybe-write-brace');
 
+const {types} = require('@putout/babel');
 const {
     isExpressionStatement,
     isAssignmentExpression,
-} = require('@putout/babel').types;
+} = types;
 
 module.exports.AssignmentExpression = (path, printer, semantics) => {
     const {print} = printer;

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

@@ -1,11 +1,11 @@
 'use strict';
 
+const {types} = require('@putout/babel');
 const {
     isStringLiteral,
     isTemplateLiteral,
     isBinaryExpression,
-} = require('@putout/babel').types;
-
+} = types;
 const isStringLike = (a) => {
     if (isStringLiteral(a))
         return true;

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

@@ -1,6 +1,7 @@
 'use strict';
 
-const {isFunction} = require('@putout/babel').types;
+const {types} = require('@putout/babel');
+const {isFunction} = types;
 const {isNext} = require('../../is');
 const {markAfter} = require('../../mark');
 

package/lib/tokenize/expressions/decorator.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const {isMemberExpression} = require('@putout/babel').types;
+const {types} = require('@putout/babel');
+const {isMemberExpression} = types;
 
 module.exports.Decorator = (path, {print, maybe}) => {
     const {expression} = path.node;

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

@@ -1,11 +1,11 @@
 'use strict';
 
+const {types} = require('@putout/babel');
 const {
     isTSModuleBlock,
     isBlockStatement,
     isExportNamedDeclaration,
-} = require('@putout/babel').types;
-
+} = types;
 const {markAfter} = require('../../mark');
 const {isNext, isNextParent} = require('../../is');
 const {printParams} = require('./params');

package/lib/tokenize/expressions/logical-expression/chain.js

@@ -1,10 +1,11 @@
 'use strict';
 
+const {types} = require('@putout/babel');
 const {
     isLogicalExpression,
     isReturnStatement,
     isVariableDeclarator,
-} = require('@putout/babel').types;
+} = types;
 
 module.exports.isRootOk = (path) => {
     return isReturnStatement(path) || isVariableDeclarator(path);

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

@@ -1,11 +1,11 @@
 'use strict';
 
+const {types} = require('@putout/babel');
 const {
     isUnaryExpression,
     isArrowFunctionExpression,
     isIfStatement,
-} = require('@putout/babel').types;
-
+} = types;
 const {chain} = require('./chain');
 const {satisfy} = require('../../is');
 

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

@@ -1,12 +1,12 @@
 'use strict';
 
+const {types} = require('@putout/babel');
 const {
     isIdentifier,
     isObjectPattern,
     isAssignmentPattern,
     isVariableDeclarator,
-} = require('@putout/babel').types;
-
+} = types;
 const {wrongShorthand} = require('./wrong-shortand');
 
 const {

package/lib/tokenize/jsx/jsx-element.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const {isJSXElement} = require('@putout/babel').types;
-
+const {types} = require('@putout/babel');
+const {isJSXElement} = types;
 const isInsideArrow = ({parentPath}) => parentPath.isArrowFunctionExpression();
 
 module.exports.JSXElement = {

package/lib/tokenize/maybe/index.js

@@ -2,7 +2,7 @@
 
 const rendy = require('rendy');
 const maybeSatisfy = require('./satisfy');
-
+const {types} = require('@putout/babel');
 const {
     isProgram,
     isFile,
@@ -10,8 +10,7 @@ const {
     ExpressionStatement,
     Program,
     isStatement,
-} = require('@putout/babel').types;
-
+} = types;
 const isFn = (a) => typeof a === 'function';
 
 module.exports.maybeThrow = (a, path, b) => {

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

@@ -8,6 +8,7 @@ const {
     satisfy,
 } = require('../../is');
 
+const {types} = require('@putout/babel');
 const {
     isArrowFunctionExpression,
     isObjectMethod,
@@ -15,8 +16,7 @@ const {
     isExportDeclaration,
     isDoWhileStatement,
     isBlockStatement,
-} = require('@putout/babel').types;
-
+} = types;
 const {markAfter} = require('../../mark');
 const {parseComments} = require('../../comment/comment');
 const {insideIfWithNoBody} = require('./inside-if-with-no-body');

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

@@ -1,7 +1,9 @@
 'use strict';
 
-const {isExportNamespaceSpecifier} = require('@putout/babel').types;
+const {types} = require('@putout/babel');
+const {isExportNamespaceSpecifier} = types;
 const {markAfter, isMarkedAfter} = require('../../mark');
+
 const {
     isNewlineBetweenSiblings,
     exists,
@@ -35,14 +37,14 @@ module.exports.ExportNamespaceSpecifier = (path, {print}) => {
 };
 
 module.exports.ExportNamedDeclaration = {
-    print(path, {print, traverse, write, indent, maybe}) {
+    print(path, {print, traverse, indent, maybe}) {
         const {exportKind} = path.node;
         const specifiers = path.get('specifiers');
         const {maxOneLineSpecifiers} = options.exports;
         const source = path.get('source');
         
         indent();
-        write('export');
+        print('export');
         
         if (exportKind === 'type' && specifiers.length)
             print(' type');
@@ -61,39 +63,43 @@ module.exports.ExportNamedDeclaration = {
         const n = specifiers.length;
         const isNewline = !exists(source) || n > maxOneLineSpecifiers;
         
-        if (specifiers.length) {
+        if (specifiers && !path.node.declaration) {
             print.space();
-            write('{');
-            indent.inc();
-            maybe.write.newline(isNewline);
-            
-            const lastIndex = n - 1;
+            print('{');
             
-            for (const [i, spec] of specifiers.entries()) {
-                const isType = spec.node.exportKind === 'type';
-                maybe.indent(isNewline);
-                maybe.write(isType, 'type ');
-                traverse(spec);
+            if (specifiers.length) {
+                indent.inc();
+                maybe.print.newline(isNewline);
                 
-                if (i < lastIndex && !isNewline)
-                    write(', ');
+                const lastIndex = n - 1;
                 
-                maybe.write(isNewline, ',');
-                maybe.write.newline(isNewline);
+                for (const [i, spec] of specifiers.entries()) {
+                    const isType = spec.node.exportKind === 'type';
+                    maybe.indent(isNewline);
+                    maybe.print(isType, 'type ');
+                    traverse(spec);
+                    
+                    if (i < lastIndex && !isNewline)
+                        print(', ');
+                    
+                    maybe.print(isNewline, ',');
+                    maybe.print.newline(isNewline);
+                }
+                
+                indent.dec();
+                indent();
             }
             
-            indent.dec();
-            indent();
-            write('}');
+            print('}');
             const source = path.get('source');
             
             if (exists(source)) {
-                write(' from ');
+                print(' from ');
                 traverse(source);
             }
             
-            write(';');
-            maybe.write.newline(isNext(path) || isInsideNamespace(path));
+            print(';');
+            maybe.print.newline(isNext(path) || isInsideNamespace(path));
             
             return;
         }

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

@@ -1,7 +1,7 @@
 'use strict';
 
-const {isJSXElement} = require('@putout/babel').types;
-
+const {types} = require('@putout/babel');
+const {isJSXElement} = types;
 const {
     isPrevBody,
     noTrailingComment,

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

@@ -9,7 +9,8 @@ const {
 } = require('../../is');
 
 const {hasPrevNewline} = require('../../mark');
-const {isExportDeclaration} = require('@putout/babel').types;
+const {types} = require('@putout/babel');
+const {isExportDeclaration} = types;
 const {maybeSpaceAfterKeyword} = require('./maybe-space-after-keyword');
 
 const {isConcatenation} = require('../../expressions/binary-expression/concatenate');

package/lib/tokenize/typescript/ts-as-expression/ts-as-expression.js

@@ -1,10 +1,11 @@
 'use strict';
 
 const {maybeParens} = require('../../maybe/maybe-parens');
+const {types} = require('@putout/babel');
 const {
     isVariableDeclarator,
     isObjectExpression,
-} = require('@putout/babel').types;
+} = types;
 
 module.exports.TSAsExpression = maybeParens((path, {print, maybe}) => {
     const is = isParens(path);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "11.9.0",
+  "version": "11.10.1",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",
@@ -53,7 +53,7 @@
   "devDependencies": {
     "@putout/eslint": "^3.5.0",
     "@putout/plugin-minify": "^9.0.0",
-    "@putout/plugin-printer": "^3.0.0",
+    "@putout/plugin-printer": "^4.0.0",
     "@putout/plugin-promises": "^16.0.0",
     "@putout/plugin-react-hook-form": "^4.0.0",
     "@putout/plugin-react-hooks": "^6.0.0",