@putout/plugin-printer 8.7.2 → 8.8.0

package/README.md

@@ -23,6 +23,7 @@ npm i @putout/plugin-printer -D
 - ✅ [apply-types](#apply-types);
 - ✅ [check-type-passed-to-type-checker](#check-type-passed-to-type-checker);
 - ✅ [check-if-success-possible-in-type-checker](#check-if-success-possible-in-type-checker);
+- ✅ [merge-tuple-of-type-checker](#merge-tuple-of-type-checker);
 - ✅ [declare](#declare);
 - ✅ [remove-args](#remove-args);
 - ✅ [remove-useless-maybe](#remove-useless-maybe);
@@ -46,6 +47,7 @@ npm i @putout/plugin-printer -D
         "printer/check-type-passed-to-type-checker": "on",
         "printer/check-if-success-possible-in-type-checker": "on",
         "printer/declare": "on",
+        "printer/merge-tuple-of-type-checker": "on",
         "printer/remove-args": "on",
         "printer/remove-useless-maybe": "on",
         "printer/remove-trailing-spaces-from-type-checker": "on",
@@ -384,6 +386,30 @@ test('', (t) => {
 });
 ```
 
+## merge-tuple-of-type-checker
+
+Checkout in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/7351b8359ac3da967e9b4b80d49b51da/74de1543f6e129f6e22f38e2eb597abce6c122a6).
+
+### ❌ Example of incorrect code
+
+```js
+export const isNewlineAfterComma = createTypeChecker([
+    ['+: -> !', isObjectExpression],
+    ['+: ->', isStringLiteral],
+    ['+', isStringLiteral],
+]);
+```
+
+### ✅ Example of correct code
+
+```js
+export const isNewlineAfterComma = createTypeChecker([
+    ['+: -> !ObjectExpression'],
+    ['+: -> StringLiteral'],
+    ['+: StringLiteral'],
+]);
+```
+
 ## remove-legacy-test-declaration
 
 ```diff

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

@@ -1,4 +1,5 @@
 import {types} from 'putout';
+import {isTypeExists} from '#types';
 
 const addQuotes = (a) => `'${a}'`;
 const {
@@ -12,14 +13,6 @@ const ARROW_LENGTH = ARROW.length;
 const ARROW_NOT_LENGTH = ARROW_NOT.length;
 const NOT = '!';
 
-const TYPES_EXISTS = new Set([
-    'CommentBlock',
-]);
-
-const TYPES_NOT_EXISTS = new Set([
-    'ExportDeclaration',
-]);
-
 const INSTEAD = new Map([
     ['ExportDeclaration', [
         'ExportAllDeclaration',
@@ -53,7 +46,7 @@ export const traverse = ({push}) => ({
         const {value} = path.node;
         
         if (!value.includes(ARROW)) {
-            if (/^[a-zA-Z].+/.test(value) && !isExists(value))
+            if (/^[a-zA-Z].+/.test(value) && !isTypeExists(value))
                 push({
                     path,
                     type: value,
@@ -68,7 +61,7 @@ export const traverse = ({push}) => ({
             
             const type = value.slice(typeNotIndex, value.length);
             
-            if (!isExists(type))
+            if (!isTypeExists(type))
                 push({
                     path,
                     type,
@@ -82,20 +75,10 @@ export const traverse = ({push}) => ({
         
         const type = value.slice(typeIndex, value.length);
         
-        if (!isExists(type))
+        if (!isTypeExists(type))
             push({
                 path,
                 type,
             });
     },
 });
-
-function isExists(type) {
-    if (TYPES_NOT_EXISTS.has(type))
-        return false;
-    
-    if (types[`is${type}`])
-        return true;
-    
-    return TYPES_EXISTS.has(type);
-}

package/lib/index.js

@@ -1,3 +1,4 @@
+import * as mergeTuplesOfTypeCheckers from './merge-tuples-of-type-checkers/index.js';
 import * as checkIfSuccessPossibleInTypeChecker from './check-if-success-possible-in-type-checker/index.js';
 import * as removeUselessTuplesFromTypeChecker from './remove-useless-tuples-from-type-checker/index.js';
 import * as addMissingTuplesToTypeChecker from './add-missing-tuples-to-type-checker/index.js';
@@ -34,4 +35,5 @@ export const rules = {
     'add-missing-tuples-to-type-checker': addMissingTuplesToTypeChecker,
     'remove-useless-tuples-from-type-checker': removeUselessTuplesFromTypeChecker,
     'check-if-success-possible-in-type-checker': checkIfSuccessPossibleInTypeChecker,
+    'merge-tuples-of-type-checkers': mergeTuplesOfTypeCheckers,
 };

package/lib/merge-tuples-of-type-checkers/index.js

@@ -0,0 +1,70 @@
+import {types, operator} from 'putout';
+import {isTypeExists} from '#types';
+
+const {
+    isArrayExpression,
+    isIdentifier,
+    isCallExpression,
+} = types;
+
+const {setLiteralValue} = operator;
+const cutIS = (a) => a.slice(2);
+
+const prepareValue = (a) => {
+    if (/^[+-]$/.test(a))
+        return `${a}: `;
+    
+    if (a.endsWith('!'))
+        return a;
+    
+    return `${a} `;
+};
+
+export const report = () => `Merge tuple of type checker`;
+
+export const fix = ({path, name}) => {
+    const [first] = path.node.elements;
+    const {value} = first;
+    
+    setLiteralValue(first, `${prepareValue(value)}${name}`);
+    path.node.elements.pop();
+};
+
+export const traverse = ({push}) => ({
+    ArrayExpression(path) {
+        const {parentPath} = path;
+        
+        if (!isCallExpression(parentPath))
+            return;
+        
+        const {callee} = parentPath.node;
+        
+        if (!isIdentifier(callee, {name: 'createTypeChecker'}))
+            return;
+        
+        const elements = path.get('elements');
+        
+        for (const element of elements) {
+            if (!isArrayExpression(element))
+                continue;
+            
+            const [, checker] = element.get('elements');
+            
+            if (!isIdentifier(checker))
+                continue;
+            
+            const checkerName = checker.node.name;
+            
+            if (!checkerName.startsWith('is'))
+                return;
+            
+            const name = cutIS(checkerName);
+            
+            if (isTypeExists(name))
+                push({
+                    path: element,
+                    name,
+                });
+        }
+    },
+});

package/lib/types.js

@@ -0,0 +1,19 @@
+import {types} from 'putout';
+
+const TYPES_EXISTS = new Set([
+    'CommentBlock',
+]);
+
+const TYPES_NOT_EXISTS = new Set([
+    'ExportDeclaration',
+]);
+
+export function isTypeExists(type) {
+    if (TYPES_NOT_EXISTS.has(type))
+        return false;
+    
+    if (types[`is${type}`])
+        return true;
+    
+    return TYPES_EXISTS.has(type);
+}

package/package.json

@@ -1,11 +1,14 @@
 {
   "name": "@putout/plugin-printer",
-  "version": "8.7.2",
+  "version": "8.8.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin adds support of transformations for @putout/printer",
   "homepage": "https://github.com/coderaiser/putout/tree/master/packages/plugin-printer#readme",
   "main": "lib/index.js",
+  "imports": {
+    "#types": "./lib/types.js"
+  },
   "release": false,
   "tag": false,
   "changelog": false,