@putout/plugin-printer 8.6.1 → 8.6.3

package/lib/add-missing-tuples-to-type-checker/index.js

@@ -1,7 +1,8 @@
+import process from 'node:process';
 import {operator, types} from 'putout';
+import {createTypeChecker} from '@putout/printer/type-checker';
 
 const {
-    isStringLiteral,
     isArrayExpression,
     isIdentifier,
     isCallExpression,
@@ -10,6 +11,7 @@ const {
 } = types;
 
 const {replaceWith} = operator;
+const instrument = process.env.PUTOUT_INSTRUMENT;
 
 export const report = (path) => {
     return `Add missing tuple around: ${path}`;
@@ -48,18 +50,36 @@ export const traverse = ({push}) => ({
     },
 });
 
+const hasResult = (value) => /^[+-]/.test(value);
+
+const isDsl = createTypeChecker([
+    ['-: -> !StringLiteral'],
+    ['+: node.value ->', hasResult],
+], {
+    instrument,
+});
+
+const isSimple = createTypeChecker([
+    'Identifier',
+    'CallExpression',
+    ['-: -> !StringLiteral'],
+    ['+: node.value ->!', hasResult],
+], {
+    instrument,
+});
+
 function isConsistent(elements) {
     const arraysCount = elements.filter(isArrayExpression).length;
     
     if (elements.length === arraysCount)
         return true;
     
-    const stringsCount = elements.filter(isStringLiteral).length;
+    const simplesCount = elements.filter(isSimple).length;
     
-    if (elements.length === stringsCount)
+    if (elements.length === simplesCount)
         return true;
     
-    const identifiersCount = elements.filter(isIdentifier).length;
+    const dslCount = elements.filter(isDsl).length;
     
-    return elements.length === identifiersCount;
+    return elements.length === dslCount;
 }

package/lib/check-type-passed-to-type-checker/index.js

@@ -13,13 +13,17 @@ const ARROW_NOT_LENGTH = ARROW_NOT.length;
 const MARK = '🧨';
 const NOT = '!';
 
+const TYPES = new Set([
+    'CommentBlock',
+]);
+
 export const report = ({type}) => {
     return `Unknown type detected: '${type}'`;
 };
 
 export const fix = ({path, type}) => {
     const {value} = path.node;
-    setLiteralValue(path, value.replace(type, `${MARK} ${type}`));
+    setLiteralValue(path, value.replace(type, `${MARK}${type}`));
 };
 
 export const traverse = ({push}) => ({
@@ -46,7 +50,7 @@ export const traverse = ({push}) => ({
             
             const type = value.slice(typeNotIndex, value.length);
             
-            if (!types[`is${type}`])
+            if (!isExists(type))
                 push({
                     path,
                     type,
@@ -60,10 +64,17 @@ export const traverse = ({push}) => ({
         
         const type = value.slice(typeIndex, value.length);
         
-        if (!types[`is${type}`])
+        if (!isExists(type))
             push({
                 path,
                 type,
             });
     },
 });
+
+function isExists(type) {
+    if (types[`is${type}`])
+        return true;
+    
+    return TYPES.has(type);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-printer",
-  "version": "8.6.1",
+  "version": "8.6.3",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin adds support of transformations for @putout/printer",
@@ -48,7 +48,8 @@
     "superc8": "^12.0.0"
   },
   "peerDependencies": {
-    "putout": ">=42"
+    "putout": ">=42",
+    "@putout/printer": ">=18"
   },
   "license": "MIT",
   "engines": {