@putout/printer 4.1.0 → 5.0.0

package/ChangeLog

@@ -1,3 +1,20 @@
+2023.09.18, v5.0.0
+
+feature:
+- 9ad0e3c package: putout v32.0.4
+- b8e15fc package: estree-to-babel v7.0.0
+- ebcf3aa package: @putout/plugin-react-hook-form v4.0.0
+- efbf8e8 package: @putout/plugin-promises v13.0.0
+- 7ebee8a package: @putout/operate v11.0.0
+- a40cb80 package: @putout/compare v13.0.0
+- 84c933d @putout/printer: TSMappedType: nameType
+
+2023.09.13, v4.2.0
+
+feature:
+- d5b4479 @putout/printer: babel 7 -> babel 8
+- dd1b24e @putout/printer: typescript: newline -> breakline
+
 2023.09.04, v4.1.0
 
 feature:

package/README.md

@@ -1,7 +1,13 @@
-# Printer [![NPM version][NPMIMGURL]][NPMURL]
+# Printer [![License][LicenseIMGURL]][LicenseURL] [![NPM version][NPMIMGURL]][NPMURL] [![Build Status][BuildStatusIMGURL]][BuildStatusURL] [![Coverage Status][CoverageIMGURL]][CoverageURL]
 
-[NPMIMGURL]: https://img.shields.io/npm/v/@putout/printer.svg?style=flat&longCache=true
 [NPMURL]: https://npmjs.org/package/@putout/printer "npm"
+[NPMIMGURL]: https://img.shields.io/npm/v/@putout/printer.svg?style=flat&longCache=true
+[BuildStatusURL]: https://github.com/putoutjs/printer/actions/workflows/nodejs.yml "Build Status"
+[BuildStatusIMGURL]: https://github.com/putoutjs/printer/actions/workflows/nodejs.yml/badge.svg
+[LicenseURL]: https://tldrlegal.com/license/mit-license "MIT License"
+[LicenseIMGURL]: https://img.shields.io/badge/license-MIT-317BF9.svg?style=flat
+[CoverageURL]: https://coveralls.io/github/putoutjs/printer?branch=master
+[CoverageIMGURL]: https://coveralls.io/repos/putoutjs/printer/badge.svg?branch=master&service=github
 
 Prints [**Babel AST**](https://github.com/coderaiser/estree-to-babel) to readable **JavaScript**. For Babel 7 use `@putout/printer` v2.
 
@@ -15,6 +21,7 @@ Supports:
 - ✅ **ES2023**;
 - ✅ **JSX**;
 - ✅ **TypeScript**;
+- ✅ [**JSON**](https://github.com/coderaiser/putout/tree/master/packages/processor-json#readme);
 
 ## Install
 

package/lib/json.js

@@ -3,7 +3,7 @@
 const {
     isCallExpression,
     isIdentifier,
-} = require('@babel/types');
+} = require('@putout/babel').types;
 
 const {isJSON} = require('@putout/processor-json/is-json');
 const {assign} = Object;

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

@@ -1,7 +1,7 @@
 'use strict';
 
 const {hasTrailingComment} = require('../is');
-const {isVariableDeclarator} = require('@babel/types');
+const {isVariableDeclarator} = require('@putout/babel').types;
 
 const {markBefore} = require('../mark');
 const {maybeInsideFn} = require('./maybe-inside-fn');

package/lib/tokenize/debug.js

@@ -4,6 +4,8 @@ const {stringify} = JSON;
 const {TYPES} = require('../types');
 const toSnakeCase = require('just-snake-case');
 
+const {codeFrameColumns} = require('@putout/babel');
+
 const {
     LOG,
     LOG_ALL,
@@ -12,8 +14,6 @@ const {
     DEBUG,
 } = process.env;
 
-const {codeFrameColumns} = require('@babel/code-frame');
-
 module.exports.createDebug = (tokens) => (a) => {
     if (!DEBUG)
         return;

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

@@ -17,7 +17,7 @@ const {
 const {
     isObjectExpression,
     isStringLiteral,
-} = require('@babel/types');
+} = require('@putout/babel').types;
 
 const isNextObject = (a) => a.getNextSibling().isObjectExpression();
 

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

@@ -12,7 +12,7 @@ const {
     isNullLiteral,
     isStringLiteral,
     isSpreadElement,
-} = require('@babel/types');
+} = require('@putout/babel').types;
 
 const {
     isStringAndMember,

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

@@ -1,6 +1,6 @@
 'use strict';
 
-const {isObjectPattern} = require('@babel/types');
+const {isObjectPattern} = require('@putout/babel').types;
 const {isParens} = require('./unary-expression/parens');
 
 module.exports.AssignmentExpression = {

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

@@ -4,7 +4,7 @@ const {
     isStringLiteral,
     isTemplateLiteral,
     isBinaryExpression,
-} = require('@babel/types');
+} = require('@putout/babel').types;
 
 const isStringLike = (a) => {
     if (isStringLiteral(a))

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

@@ -5,7 +5,7 @@ const {
     isArrowFunctionExpression,
     isLogicalExpression,
     isIfStatement,
-} = require('@babel/types');
+} = require('@putout/babel').types;
 
 const {chain} = require('./chain');
 const {satisfy} = require('../../is');

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

@@ -4,7 +4,7 @@ const {
     isIdentifier,
     isObjectPattern,
     isAssignmentPattern,
-} = require('@babel/types');
+} = require('@putout/babel').types;
 
 const {wrongShorthand} = require('./wrong-shortand');
 

package/lib/tokenize/is.js

@@ -9,7 +9,7 @@ const {
     isVariableDeclaration,
     isMemberExpression,
     isArrayExpression,
-} = require('@babel/types');
+} = require('@putout/babel').types;
 
 const isParentProgram = (path) => path.parentPath?.isProgram();
 const isParentBlock = (path) => path.parentPath.isBlockStatement();

package/lib/tokenize/maybe/index.js

@@ -10,7 +10,7 @@ const {
     ExpressionStatement,
     Program,
     isStatement,
-} = require('@babel/types');
+} = require('@putout/babel').types;
 
 const isFn = (a) => typeof a === 'function';
 

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

@@ -10,7 +10,7 @@ const {
 const {
     isArrowFunctionExpression,
     isObjectMethod,
-} = require('@babel/types');
+} = require('@putout/babel').types;
 
 const {markAfter} = require('../../mark');
 const {parseComments} = require('../../comment/comment');

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

@@ -8,7 +8,7 @@ const {
 } = require('../../is');
 
 const {markAfter, isMarkedAfter} = require('../../mark');
-const {isExportNamespaceSpecifier} = require('@babel/types');
+const {isExportNamespaceSpecifier} = require('@putout/babel').types;
 const isDeclarationNewline = (path) => isMarkedAfter(path.get('declaration'));
 const isInsideNamespace = (path) => path.parentPath.isTSModuleBlock();
 

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

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

package/lib/tokenize/tokenize.js

@@ -3,7 +3,7 @@
 const {round} = Math;
 const fullstore = require('fullstore');
 const isObject = (a) => a && typeof a === 'object';
-const babelTraverse = require('@babel/traverse').default;
+const babelTraverse = require('@putout/babel').traverse;
 const expressions = require('./expressions');
 const statements = require('./statements');
 const literals = require('./literals');

package/lib/tokenize/typescript/interface/ts-interface-declaration.js

@@ -4,7 +4,7 @@ const {isNext, isNextParent} = require('../../is');
 const {
     isTSTypeAliasDeclaration,
     isExportDeclaration,
-} = require('@babel/types');
+} = require('@putout/babel').types;
 
 module.exports.TSInterfaceDeclaration = {
     print(path, {print}) {

package/lib/tokenize/typescript/ts-mapped-type.js

@@ -1,33 +1,47 @@
 'use strict';
 
-module.exports.TSMappedType = (path, {print, write, indent, maybe}) => {
-    const {readonly, optional} = path.node;
+const {types} = require('@putout/babel');
+const {isTSConditionalType} = types;
+
+module.exports.TSMappedType = (path, {print, indent, maybe}) => {
+    const {
+        readonly,
+        optional,
+        nameType,
+    } = path.node;
     
-    write('{');
-    write.newline();
+    print('{');
+    print.newline();
     indent.inc();
     indent();
     
     if (readonly) {
-        maybe.write(readonly === '-', '-');
-        write('readonly ');
+        maybe.print(readonly === '-', '-');
+        print('readonly ');
     }
     
-    write('[');
+    print('[');
     print('__typeParameter');
-    write(']');
+    
+    if (nameType) {
+        print(' as');
+        maybe.space(!isTSConditionalType(nameType));
+        print('__nameType');
+    }
+    
+    print(']');
     
     if (optional) {
-        maybe.write(optional === '+', '+');
-        maybe.write(optional === '-', '-');
-        write('?');
+        maybe.print(optional === '+', '+');
+        maybe.print(optional === '-', '-');
+        print('?');
     }
     
-    write(':');
-    write.space();
+    print(':');
+    print.space();
     print('__typeAnnotation');
-    write(';');
+    print(';');
     indent.dec();
-    write.newline();
-    write('}');
+    print.breakline();
+    print('}');
 };

package/lib/tokenize/typescript/type/ts-type-literal.js

@@ -23,8 +23,8 @@ module.exports.TSTypeLiteral = (path, {indent, traverse, write, maybe}) => {
     }
     
     if (is) {
-        write.newline();
         indent.dec();
+        write.breakline();
     }
     
     write('}');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "4.1.0",
+  "version": "5.0.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",
@@ -26,12 +26,9 @@
     "report": "madrun report"
   },
   "dependencies": {
-    "@babel/code-frame": "^7.18.6",
-    "@babel/parser": "^7.19.0",
-    "@babel/traverse": "^7.21.2",
-    "@babel/types": "^7.21.3",
-    "@putout/compare": "^12.0.4",
-    "@putout/operate": "^10.0.2",
+    "@putout/babel": "^1.1.1",
+    "@putout/compare": "^13.0.0",
+    "@putout/operate": "^11.0.0",
     "@putout/processor-json": "^7.0.0",
     "fullstore": "^3.0.0",
     "just-snake-case": "^3.2.0",
@@ -51,8 +48,8 @@
     "@babel/plugin-codemod-object-assign-to-object-spread": "^7.10.4",
     "@putout/plugin-minify": "^4.0.0",
     "@putout/plugin-printer": "^2.0.0",
-    "@putout/plugin-promises": "^12.0.0",
-    "@putout/plugin-react-hook-form": "^3.4.1",
+    "@putout/plugin-promises": "^13.0.0",
+    "@putout/plugin-react-hook-form": "^4.0.0",
     "@putout/plugin-react-hooks": "^5.0.0",
     "acorn": "^8.8.2",
     "c8": "^8.0.0",
@@ -60,13 +57,13 @@
     "eslint": "^8.0.1",
     "eslint-plugin-n": "^16.0.0",
     "eslint-plugin-putout": "^19.0.2",
-    "estree-to-babel": "^6.0.0",
+    "estree-to-babel": "^7.0.0",
     "just-kebab-case": "^4.2.0",
     "madrun": "^9.0.0",
     "mock-require": "^3.0.3",
     "montag": "^1.0.0",
     "nodemon": "^3.0.1",
-    "putout": "^31.0.3",
+    "putout": "^32.0.4",
     "supertape": "^8.0.0",
     "try-catch": "^3.0.0"
   },