@putout/plugin-printer 8.5.1 → 8.6.0

package/README.md

@@ -14,7 +14,8 @@ npm i @putout/plugin-printer -D
 ## Rules
 
 - ✅ [add-args](#add-args);
-- ✅ [add-missing-spacess-to-type-checker](#add-missing-spacess-to-type-checker);
+- ✅ [add-missing-spaces-to-type-checker](#add-missing-spaces-to-type-checker);
+- ✅ [add-missing-tuples-to-type-checker](#add-missing-tuples-to-type-checker);
 - ✅ [apply-breakline](#apply-breakline);
 - ✅ [apply-computed-print](#apply-computed-print);
 - ✅ [apply-create-test-url](#apply-create-test-url);
@@ -27,6 +28,7 @@ npm i @putout/plugin-printer -D
 - ✅ [remove-legacy-test-declaration](#remove-legacy-test-declaration);
 - ✅ [remove-trailing-spaces-from-type-checker](#remove-trailing-spaces-from-type-checker)
 - ✅ [remove-useless-spaces-from-type-checker](#remove-useless-spaces-from-type-checker)
+- ✅ [remove-useless-tuples-from-type-checker](#remove-useless-tuples-from-type-checker)
 
 ## Config
 
@@ -34,7 +36,7 @@ npm i @putout/plugin-printer -D
 {
     "rules": {
         "printer/add-args": "on",
-        "printer/add-missing-spacess-to-type-checker": "on",
+        "printer/add-missing-tuples-to-type-checker": "on",
         "printer/apply-breakline": "on",
         "printer/apply-linebreak": "on",
         "printer/apply-computed-print": "on",
@@ -45,7 +47,8 @@ npm i @putout/plugin-printer -D
         "printer/remove-args": "on",
         "printer/remove-useless-maybe": "on",
         "printer/remove-trailing-spaces-from-type-checker": "on",
-        "printer/remove-useless-spaces-from-type-checker": "on"
+        "printer/remove-useless-spaces-from-type-checker": "on",
+        "printer/remove-useless-tuples-from-type-checker": "on"
     }
 }
 ```
@@ -102,7 +105,7 @@ module.exports = {
 };
 ```
 
-## add-missing-spacess-to-type-checker
+## add-missing-spaces-to-type-checker
 
 Checkout in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/2451cd51ebd3dfd20c32b6d22ca176b7/bd593860ff4bb2d66e06cf95bbe103cb1203129d).
 
@@ -124,6 +127,34 @@ export const beforeIf = createTypeChecker([
 ]);
 ```
 
+## add-missing-tuple-to-type-checker
+
+Checkout in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/9fdfda423df3af9b0f08541710706299/0259bba117997861fe7573bad5477282f4df8554).
+
+### ❌ Example of incorrect code
+
+```js
+export const beforeIf = createTypeChecker([
+    '- : -> !StringLiteral',
+    '- : -> BlockStatement',
+    '- : -> WrongType',
+    ['- : ->', isBlockStatement],
+    ['-', isBlockStatement],
+]);
+```
+
+### ✅ Example of correct code
+
+```js
+export const beforeIf = createTypeChecker([
+    ['- : -> !StringLiteral'],
+    ['- : -> BlockStatement'],
+    ['- : -> WrongType'],
+    ['- : ->', isBlockStatement],
+    ['-', isBlockStatement],
+]);
+```
+
 ## apply-computed-print
 
 ### ❌ Example of incorrect code
@@ -210,6 +241,28 @@ export const beforeIf = createTypeChecker([
 ]);
 ```
 
+## remove-useless-tuples-from-type-checker
+
+Checkout in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/f53f386b607115e0a96f7e294e34761e/cefd72aba4fcade59bbf8faa59739bac5c2fe057).
+
+### ❌ Example of incorrect code
+
+```js
+export const allStrings = createTypeChecker([
+    ['- : -> BlockStatement'],
+    ['- : -> WrongType'],
+]);
+```
+
+### ✅ Example of correct code
+
+```js
+export const allStrings = createTypeChecker([
+    '- : -> BlockStatement',
+    '- : -> WrongType',
+]);
+```
+
 ## remove-trailing-spaces-from-type-checker
 
 Checkout in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/91d33e39485c31e76b534ad8447ba4db/abca8d21ad6edc1f6fed23edb05fa166677f11d6).

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

@@ -0,0 +1,65 @@
+import {operator, types} from 'putout';
+
+const {
+    isStringLiteral,
+    isArrayExpression,
+    isIdentifier,
+    isCallExpression,
+    arrayExpression,
+    stringLiteral,
+} = types;
+
+const {replaceWith} = operator;
+
+export const report = (path) => {
+    return `Add missing tuple around: ${path}`;
+};
+
+export const fix = (path) => {
+    const {node} = path;
+    
+    if (isIdentifier(path)) {
+        replaceWith(path, arrayExpression([stringLiteral('+'), node]));
+        return;
+    }
+    
+    replaceWith(path, arrayExpression([node]));
+};
+
+export const traverse = ({push}) => ({
+    ArrayExpression(path) {
+        const {parentPath} = path;
+        
+        if (!isCallExpression(parentPath))
+            return;
+        
+        if (!isIdentifier(parentPath.node.callee, {name: 'createTypeChecker'}))
+            return;
+        
+        const elements = path.get('elements');
+        
+        if (isConsistent(elements))
+            return;
+        
+        for (const element of elements) {
+            if (!isArrayExpression(element))
+                push(element);
+        }
+    },
+});
+
+function isConsistent(elements) {
+    const arraysCount = elements.filter(isArrayExpression).length;
+    
+    if (elements.length === arraysCount)
+        return true;
+    
+    const stringsCount = elements.filter(isStringLiteral).length;
+    
+    if (elements.length === stringsCount)
+        return true;
+    
+    const identifiersCount = elements.filter(isIdentifier).length;
+    
+    return elements.length === identifiersCount;
+}

package/lib/index.js

@@ -1,3 +1,5 @@
+import * as removeUselessTuplesFromTypeChecker from './remove-useless-tuples-from-type-checker/index.js';
+import * as addMissingTuplesToTypeChecker from './add-missing-tuples-to-type-checker/index.js';
 import * as checkTypePassedToTypeChecker from './check-type-passed-to-type-checker/index.js';
 import * as removeUselessSpacesFromTypeChecker from './remove-useless-spaces-from-type-checker/index.js';
 import * as addMissingSpacesToTypeChecker from './add-missing-spaces-to-type-checker/index.js';
@@ -28,4 +30,6 @@ export const rules = {
     'add-missing-spaces-to-type-checker': addMissingSpacesToTypeChecker,
     'remove-useless-spaces-from-type-checker': removeUselessSpacesFromTypeChecker,
     'check-type-passed-to-type-checker': checkTypePassedToTypeChecker,
+    'add-missing-tuples-to-type-checker': addMissingTuplesToTypeChecker,
+    'remove-useless-tuples-from-type-checker': removeUselessTuplesFromTypeChecker,
 };

package/lib/remove-useless-tuples-from-type-checker/index.js

@@ -0,0 +1,62 @@
+import {operator, types} from 'putout';
+
+const {
+    isStringLiteral,
+    isArrayExpression,
+    isIdentifier,
+    isCallExpression,
+} = types;
+
+const {replaceWith} = operator;
+
+export const report = (path) => {
+    return `Remove useless tuple from: ${path}`;
+};
+
+export const fix = (path) => {
+    const [element] = path.node.elements;
+    replaceWith(path, element);
+};
+
+export const traverse = ({push}) => ({
+    ArrayExpression(path) {
+        const {parentPath} = path;
+        
+        if (!isCallExpression(parentPath))
+            return;
+        
+        if (!isIdentifier(parentPath.node.callee, {name: 'createTypeChecker'}))
+            return;
+        
+        const elements = path.get('elements');
+        
+        if (isConsistent(elements))
+            return;
+        
+        for (const element of elements) {
+            if (isArrayExpression(element))
+                push(element);
+        }
+    },
+});
+
+const isTwoElementTuple = (a) => {
+    if (!isArrayExpression(a))
+        return false;
+    
+    return a.node.elements.length === 2;
+};
+
+function isConsistent(elements) {
+    const stringsCount = elements.filter(isStringLiteral).length;
+    
+    if (elements.length === stringsCount)
+        return true;
+    
+    const identifiersCount = elements.filter(isIdentifier).length;
+    
+    if (elements.length === identifiersCount)
+        return true;
+    
+    return elements.filter(isTwoElementTuple).length;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-printer",
-  "version": "8.5.1",
+  "version": "8.6.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin adds support of transformations for @putout/printer",