@putout/printer 9.15.2 → 9.17.0

package/ChangeLog

@@ -1,3 +1,14 @@
+2024.09.27, v9.17.0
+
+feature:
+- 13a81f2 @putout/printer: FunctionDeclaration: nested
+
+2024.09.27, v9.16.0
+
+feature:
+- 3cf8ea6 @putout/printer: strict mode: newline
+- 41c63a8 @putout/printer: FunctionExpression: IIFE: improve support
+
 2024.09.11, v9.15.2
 
 fix:

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

@@ -1,7 +1,7 @@
 'use strict';
 
-const {isArray} = Array;
 const {exists} = require('../is');
+const {isArray} = Array;
 
 const parseArgs = (path) => {
     const argsPath = path.get('arguments');

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

@@ -6,13 +6,19 @@ const {printParams} = require('./params');
 
 module.exports.FunctionDeclaration = {
     print(path, printer, semantics) {
-        const {print, maybe} = printer;
+        const {
+            print,
+            maybe,
+            indent,
+        } = printer;
+        
         const {
             async,
             generator,
             returnType,
         } = path.node;
         
+        indent();
         maybe.print(async, 'async ');
         
         print('function');
@@ -35,9 +41,16 @@ module.exports.FunctionDeclaration = {
         print.space();
         print('__body');
     },
-    afterSatisfy: () => [isNext, isNextParent],
+    afterSatisfy: () => [isNext, isNextParent, isInsideBlockStatement],
     after(path, {write}) {
         write.newline();
         markAfter(path);
     },
 };
+
+function isInsideBlockStatement(path) {
+    if (!path.parentPath.isBlockStatement())
+        return false;
+    
+    return !path.node.body.body.length;
+}

package/lib/tokenize/literals/index.js

@@ -4,16 +4,7 @@ const {TemplateLiteral} = require('./template-literal');
 const {Identifier} = require('./identifier');
 
 const {Decorator} = require('../expressions/decorator');
-
-const maybeEncode = (value, {encodeDoubleQuote, encodeSingleQuote}) => {
-    if (encodeSingleQuote && !value.includes('\\'))
-        return value.replaceAll(`'`, `\\'`);
-    
-    if (encodeDoubleQuote && !value.includes('\\"'))
-        return value.replaceAll(`"`, '\\"');
-    
-    return value;
-};
+const {StringLiteral} = require('./string-literal');
 
 module.exports = {
     Identifier,
@@ -44,27 +35,7 @@ module.exports = {
     BooleanLiteral(path, {write}) {
         write(path.node.value);
     },
-    StringLiteral(path, {write}, semantics) {
-        const {raw, value} = path.node;
-        
-        if (raw && path.parentPath.isJSXAttribute()) {
-            write(raw);
-            return;
-        }
-        
-        if (raw) {
-            const value = raw.slice(1, -1);
-            write.quote();
-            write(maybeEncode(value, semantics));
-            write.quote();
-            
-            return;
-        }
-        
-        write.quote();
-        write(value);
-        write.quote();
-    },
+    StringLiteral,
     RegExpLiteral(path, {print}) {
         const {raw, pattern} = path.node;
         print(raw || `/${pattern}/`);

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

@@ -0,0 +1,33 @@
+'use strict';
+
+const maybeEncode = (value, {encodeDoubleQuote, encodeSingleQuote}) => {
+    if (encodeSingleQuote && !value.includes('\\'))
+        return value.replaceAll(`'`, `\\'`);
+    
+    if (encodeDoubleQuote && !value.includes('\\"'))
+        return value.replaceAll(`"`, '\\"');
+    
+    return value;
+};
+
+module.exports.StringLiteral = (path, {write}, semantics) => {
+    const {raw, value} = path.node;
+    
+    if (raw && path.parentPath.isJSXAttribute()) {
+        write(raw);
+        return;
+    }
+    
+    if (raw) {
+        const value = raw.slice(1, -1);
+        write.quote();
+        write(maybeEncode(value, semantics));
+        write.quote();
+        
+        return;
+    }
+    
+    write.quote();
+    write(value);
+    write.quote();
+};

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

@@ -58,6 +58,8 @@ module.exports.BlockStatement = {
             traverse(directive);
         }
         
+        maybe.write.linebreak(directives.length && body.length);
+        
         for (const element of body) {
             traverse(element);
         }

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

@@ -1,6 +1,7 @@
 'use strict';
 
-module.exports.ForInStatement = (path, {print}) => {
+module.exports.ForInStatement = (path, {print, indent}) => {
+    indent();
     print('for');
     print.space();
     print('(');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "9.15.2",
+  "version": "9.17.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",
@@ -12,7 +12,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/putoutjs/printer.git"
+    "url": "git+https://github.com/putoutjs/printer.git"
   },
   "scripts": {
     "wisdom": "madrun wisdom",