@putout/printer 18.4.6 → 18.5.0

package/ChangeLog

@@ -1,3 +1,14 @@
+2026.03.13, v18.5.0
+
+feature:
+- c797ef4 @putout/printer: type-checker: rm include/exclude
+- 5147c03 @putout/printer: merge-tuples-of-type-checkers
+
+2026.03.12, v18.4.7
+
+feature:
+- de587ba @putout/printer: private imports: comments
+
 2026.03.12, v18.4.6
 
 feature:

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

@@ -9,12 +9,7 @@ import {
     isTrailingCommaOption,
 } from './is.js';
 
-const {
-    isSpreadElement,
-    isCallExpression,
-    isObjectExpression,
-    isIdentifier,
-} = types;
+const {isObjectExpression} = types;
 
 const isCommaAfterElementByOption = createTypeChecker([
     ['+: -> !', isLastOption],
@@ -35,9 +30,9 @@ export const isNewlineAfterComma = createTypeChecker([
 
 const isSimpleBetweenObjects = createTypeChecker([
     ['+', callWithNext(isObjectExpression)],
-    ['-', isSpreadElement],
-    ['-', isIdentifier],
-    ['+: -> !', isCallExpression],
+    ['-: SpreadElement'],
+    ['-: Identifier'],
+    ['+: -> !CallExpression'],
 ]);
 
 export const isSpaceAfterComa = createTypeChecker([

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

@@ -1,13 +1,11 @@
-import {types} from '@putout/babel';
 import {createTypeChecker} from '#type-checker';
 
-const {isBinaryExpression} = types;
 const isPlus = (a) => a === '+';
 
 export const isConcatenation = createTypeChecker([
     ['-: node.operator -> !', isPlus],
     ['-: node.loc', isSameLine],
-    ['+', isBinaryExpression],
+    ['+: BinaryExpression'],
 ]);
 
 function isSameLine(loc) {

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

@@ -7,7 +7,7 @@ import {
     isInsideExportDeclaration,
     isNext,
 } from '#is';
-import {parseComments} from '../../comment/comment.js';
+import {parseComments} from '#comments';
 import {maybeDecorators} from '../../maybe/maybe-decorators.js';
 
 const isFunctionLike = (path) => isFunction(path.parentPath.parentPath);

package/lib/tokenize/expressions/function/params.js

@@ -1,4 +1,4 @@
-import {parseComments} from '../../comment/comment.js';
+import {parseComments} from '#comments';
 
 const noop = () => {};
 const parseParams = (path) => path.get('params');

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

@@ -1,5 +1,6 @@
 import {types} from '@putout/babel';
 import {createTypeChecker} from '#type-checker';
+import {parseComments} from '#comments';
 import {
     isCoupleLines,
     isForOf,
@@ -10,7 +11,6 @@ import {
     isInsideExpression,
     hasTrailingComment,
 } from '#is';
-import {parseComments} from '../../comment/comment.js';
 import {isInsideTuple} from './is-inside-tuple.js';
 import {isLooksLikeChain} from '../member-expression/is-looks-like-chain.js';
 import {isCommaAfterSpread} from './comma.js';

package/lib/tokenize/jsx/index.js

@@ -1,5 +1,5 @@
 import {isCoupleLines} from '#is';
-import {parseComments} from '../comment/comment.js';
+import {parseComments} from '#comments';
 
 export {JSXElement} from './jsx-element.js';
 export {JSXAttribute} from './jsx-attribute.js';

package/lib/tokenize/printer/printer.js

@@ -1,13 +1,13 @@
 import {fullstore} from 'fullstore';
 import {TYPES} from '#types';
 import {maybeMarkAfter} from '#mark';
-import {createDebug, createLog} from './debug.js';
-import * as baseVisitors from '../visitors.js';
-import {maybeVisitor, maybeThrow} from '../maybe/index.js';
 import {
     parseLeadingComments,
     parseTrailingComments,
-} from '../comment/comment.js';
+} from '#comments';
+import {createDebug, createLog} from './debug.js';
+import * as baseVisitors from '../visitors.js';
+import {maybeVisitor, maybeThrow} from '../maybe/index.js';
 import {parseOverrides} from '../overrides/overrides.js';
 import {createIndent} from './indent.js';
 

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

@@ -1,7 +1,7 @@
 import {markAfter} from '#mark';
 import {createTypeChecker} from '#type-checker';
 import {isInsideBlock} from '#is';
-import {parseComments} from '../../comment/comment.js';
+import {parseComments} from '#comments';
 import {getDirectives} from './get-directives.js';
 import {isCallInsideChain} from './is-call-inside-chain.js';
 import {shouldAddNewlineAfter} from './block-statement-newline.js';

package/lib/tokenize/statements/program/program.js

@@ -1,5 +1,5 @@
 import {hasCoupleTrailingComments} from '#is';
-import {parseComments} from '../../comment/comment.js';
+import {parseComments} from '#comments';
 import {getDirectives} from '../block-statement/get-directives.js';
 
 export const Program = (path, printer, semantics) => {

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

@@ -3,7 +3,7 @@ import {
     exists,
     isLast,
 } from '#is';
-import {parseLeadingComments} from '../../comment/comment.js';
+import {parseLeadingComments} from '#comments';
 import {maybeSpaceAfterKeyword} from '../return-statement/maybe-space-after-keyword.js';
 
 export const SwitchStatement = {

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

@@ -3,6 +3,7 @@ import {hasPrevNewline} from '#mark';
 import {createTypeChecker} from '#type-checker';
 import {isConcatenation} from '#is-concatenation';
 import {maybeDeclare} from '#maybe-declare';
+import {parseLeadingComments} from '#comments';
 import {
     isNext,
     isCoupleLines,
@@ -19,7 +20,6 @@ import {
     callWithParent,
 } from '#is';
 import {maybeSpaceAfterKeyword} from './maybe-space-after-keyword.js';
-import {parseLeadingComments} from '../../comment/comment.js';
 
 const {isExportDeclaration} = types;
 

package/lib/tokenize/type-checker/parsers.js

@@ -20,40 +20,28 @@ const parseResult = (a) => a === '+';
 export function parseTypeNames(typeNames) {
     const tuples = [];
     
-    if (isArray(typeNames)) {
-        for (const typeName of typeNames) {
-            if (isArray(typeName) && typeName.length === 1) {
-                const [first] = typeName;
-                const tuple = createTuple(first);
-                
-                tuples.push(tuple);
-                continue;
-            }
+    for (const typeName of typeNames) {
+        if (isArray(typeName) && typeName.length === 1) {
+            const [first] = typeName;
+            const tuple = createTuple(first);
             
-            if (isArray(typeName)) {
-                tuples.push(typeName);
-                continue;
-            }
-            
-            if (isString(typeName) && typeName.includes(' -> ')) {
-                const tuple = createTuple(typeName);
-                tuples.push(tuple);
-                continue;
-            }
-            
-            tuples.push(['+', typeName]);
+            tuples.push(tuple);
+            continue;
+        }
+        
+        if (isArray(typeName)) {
+            tuples.push(typeName);
+            continue;
+        }
+        
+        if (isString(typeName) && typeName.includes(' -> ')) {
+            const tuple = createTuple(typeName);
+            tuples.push(tuple);
+            continue;
         }
         
-        return tuples;
-    }
-    
-    for (const typeName of typeNames.include) {
         tuples.push(['+', typeName]);
     }
     
-    for (const typeName of typeNames.exclude) {
-        tuples.push(['-', typeName]);
-    }
-    
     return tuples;
 }

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

@@ -1,4 +1,4 @@
-import {parseComments} from '../../comment/comment.js';
+import {parseComments} from '#comments';
 
 export const TSInterfaceBody = (path, printer, semantics) => {
     const body = path.get('body');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "18.4.6",
+  "version": "18.5.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",
@@ -70,7 +70,8 @@
     "#type-checker": "./lib/tokenize/type-checker/type-checker.js",
     "#type-checker/instrument": "./lib/tokenize/type-checker/instrument.js",
     "#type-checker/report": "./lib/tokenize/type-checker/report.js",
-    "#is-concatenation": "./lib/tokenize/expressions/binary-expression/is-concatenation.js"
+    "#is-concatenation": "./lib/tokenize/expressions/binary-expression/is-concatenation.js",
+    "#comments": "./lib/tokenize/comments/comments.js"
   },
   "devDependencies": {
     "@babel/parser": "^7.28.5",