feature: @putout/plugin-printer: add-missing-tuples-to-type-checker: exclude dsl

Author: coderaiser

packages/plugin-printer/lib/add-missing-tuples-to-type-checker/fixture/add-missing-tuples-to-type-checker-fix.js

@@ -11,11 +11,11 @@ export const allTuples = createTypeChecker([
     ['-', isBlockStatement],
 ]);
 
+export const allIdentifiers = createTypeChecker([
+    isExpressionStatement,
+]);
+
 export const allStrings = createTypeChecker([
     '- : -> BlockStatement',
     '- : -> WrongType',
 ]);
-
-export const allIdentifiers = createTypeChecker([
-    isExpressionStatement,
-]);

packages/plugin-printer/lib/add-missing-tuples-to-type-checker/fixture/add-missing-tuples-to-type-checker.js

@@ -11,11 +11,12 @@ export const allTuples = createTypeChecker([
     ['-', isBlockStatement],
 ]);
 
+export const allIdentifiers = createTypeChecker([
+    isExpressionStatement,
+]);
+
 export const allStrings = createTypeChecker([
     '- : -> BlockStatement',
     '- : -> WrongType',
 ]);
 
-export const allIdentifiers = createTypeChecker([
-    isExpressionStatement,
-]);

packages/plugin-printer/lib/add-missing-tuples-to-type-checker/fixture/mixed.js

@@ -0,0 +1,4 @@
+const isBreakline = createTypeChecker([
+    isNewlineBetweenSiblings,
+    callWithNext(isIfStatement)
+]);

packages/plugin-printer/lib/add-missing-tuples-to-type-checker/fixture/strings.js

@@ -0,0 +1,6 @@
+const isInsideParentLike = callWithParent(createTypeChecker([
+    'Program',
+    'BlockStatement',
+    'ExportNamedDeclaration',
+    'LabeledStatement',
+]));

packages/plugin-printer/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;
 }

packages/plugin-printer/lib/add-missing-tuples-to-type-checker/index.spec.js

@@ -31,3 +31,13 @@ test('printer: add-missing-tuples-to-type-checker: no report: not-type-checker',
     t.noReport('not-type-checker');
     t.end();
 });
+
+test('printer: add-missing-tuples-to-type-checker: no report: mixed', (t) => {
+    t.noReport('mixed');
+    t.end();
+});
+
+test('printer: add-missing-tuples-to-type-checker: no report: strings', (t) => {
+    t.noReport('strings');
+    t.end();
+});

packages/plugin-printer/package.json

@@ -48,7 +48,8 @@
     "superc8": "^12.0.0"
   },
   "peerDependencies": {
-    "putout": ">=42"
+    "putout": ">=42",
+    "@putout/printer": ">=18"
   },
   "license": "MIT",
   "engines": {