@putout/printer 1.143.0 → 1.145.0

package/ChangeLog

@@ -1,3 +1,14 @@
+2023.06.08, v1.145.0
+
+feature:
+- 9d33542 @putout/printer: ArrayExpression: tuple: Identifier and StringLiteral
+
+2023.06.07, v1.144.0
+
+feature:
+- 1a0881b @putout/printer: semantics: add
+- 21298d2 @putout/printer: add ability to configurate semantics
+
 2023.06.07, v1.143.0
 
 feature:

package/README.md

@@ -85,6 +85,10 @@ write(ast, {
         roundBraceOpen: '(',
         roundBraceClose: ')',
     },
+    semantics: {
+        maxSpecifiersInOneLine: 2,
+        maxElementsInOneLine: 3,
+    },
     visitors: {
         AssignmentPattern(path, {write}) {
             write('/* [hello world] */= ');

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

@@ -18,6 +18,8 @@ const {isSimple} = require('@putout/operate');
 const {
     isCoupleLines,
     isStringAndIdentifier,
+    isIdentifierAndString,
+
 } = require('../is');
 
 const isForOf = ({parentPath}) => parentPath.isForOfStatement();
@@ -261,6 +263,9 @@ function isNewlineBetweenElements(path, {elements}) {
     if (isStringAndIdentifier(elements))
         return false;
     
+    if (isIdentifierAndString(elements))
+        return false;
+    
     if (isSimpleAndObject(elements))
         return false;
     

package/lib/tokenize/expressions/array-pattern.js

@@ -2,13 +2,15 @@
 
 const isForOf = ({parentPath}) => parentPath.parentPath.parentPath?.isForOfStatement();
 
-module.exports.ArrayPattern = (path, {indent, maybe, print}) => {
+module.exports.ArrayPattern = (path, {indent, maybe, print}, options) => {
+    const {maxElementsInOneLine} = options;
+    
     print('[');
     
     const elements = path.get('elements');
     indent.inc();
     
-    const isNewLine = !isForOf(path) && elements.length > 2;
+    const isNewLine = !isForOf(path) && elements.length > maxElementsInOneLine;
     const n = elements.length - 1;
     
     maybe.print(isNewLine && elements.length, '\n');

package/lib/tokenize/is.js

@@ -43,6 +43,7 @@ function isCoupleLines(path) {
 
 module.exports.exists = (a) => a.node;
 module.exports.isStringAndIdentifier = ([a, b]) => isStringLiteral(a) && isIdentifier(b);
+module.exports.isIdentifierAndString = ([a, b]) => isIdentifier(a) && isStringLiteral(b);
 
 const isIfOrStatement = (a) => isIfStatement(a) || isStatement(a);
 const isForOfOrStatement = (a) => isForOfStatement(a) || isStatement(a);

package/lib/tokenize/maybe/index.js

@@ -29,14 +29,14 @@ const maybeProgram = (ast) => isProgram(ast) ? ast : Program([
 
 module.exports.maybeFile = (ast) => isFile(ast) ? ast : File(maybeProgram(ast));
 
-module.exports.maybePlugin = (plugin, path, printer) => {
+module.exports.maybePlugin = (plugin, path, printer, options) => {
     if (isFn(plugin))
-        return plugin(path, printer);
+        return plugin(path, printer, options);
     
-    return objectPlugin(plugin, path, printer);
+    return objectPlugin(plugin, path, printer, options);
 };
 
-function objectPlugin(plugin, path, printer) {
+function objectPlugin(plugin, path, printer, options) {
     const {
         print,
         split,
@@ -51,7 +51,7 @@ function objectPlugin(plugin, path, printer) {
         before(path, printer);
     }
     
-    print(path, printer);
+    print(path, printer, options);
     
     if (afterIf?.(path, printer)) {
         after(path, printer);

package/lib/tokenize/overrides.js

@@ -0,0 +1,36 @@
+'use strict';
+
+module.exports.parseOverrides = (overrides = {}) => {
+    const {
+        format,
+        semantics,
+        visitors,
+    } = overrides;
+    
+    return {
+        format: initFormat(format),
+        semantics: initSemantics(semantics),
+        visitors,
+    };
+};
+
+function initFormat(format) {
+    return {
+        indent: '    ',
+        newline: '\n',
+        space: ' ',
+        comments: true,
+        splitter: '\n',
+        roundBraceOpen: '(',
+        roundBraceClose: ')',
+        ...format,
+    };
+}
+
+function initSemantics(semantics = {}) {
+    return {
+        maxSpecifiersInOneLine: 2,
+        maxElementsInOneLine: 5,
+        ...semantics,
+    };
+}

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

@@ -9,18 +9,12 @@ const {
     ImportAttribute,
 } = require('./import-attribute');
 
-const options = {
-    imports: {
-        maxOneLineSpecifiers: 2,
-    },
-};
-
 module.exports.ImportAttribute = ImportAttribute;
 module.exports.ImportDeclaration = {
-    print(path, {print, maybe, write, traverse, indent}) {
+    print(path, {print, maybe, write, traverse, indent}, options) {
         const isType = path.node.importKind === 'type';
         const specifiers = path.get('specifiers');
-        const {maxOneLineSpecifiers} = options.imports;
+        const {maxSpecifiersInOneLine} = options;
         
         print('import');
         maybe.print(isType, ' type');
@@ -61,7 +55,7 @@ module.exports.ImportDeclaration = {
             indent.inc();
             
             maybe.write(!wasSpecifier, '{');
-            maybe.write.breakline(importsCount > 2);
+            maybe.write.breakline(importsCount > maxSpecifiersInOneLine);
             
             wasSpecifier = true;
             write(imported.name);
@@ -71,12 +65,12 @@ module.exports.ImportDeclaration = {
                 write(spec.node.local.name);
             }
             
-            if (importsCount <= maxOneLineSpecifiers && notLast) {
+            if (importsCount <= maxSpecifiersInOneLine && notLast) {
                 maybe.write(n, ',');
                 maybe.write.space(n);
             }
             
-            if (importsCount > maxOneLineSpecifiers) {
+            if (importsCount > maxSpecifiersInOneLine) {
                 maybe.write(n, ',');
                 maybe.write.newline(index === n);
             }

package/lib/tokenize/tokenize.js

@@ -32,6 +32,8 @@ const {
     parseTrailingComments,
 } = require('./comments');
 
+const {parseOverrides} = require('./overrides');
+
 const isString = (a) => typeof a === 'string';
 const {assign} = Object;
 const callWith = (fn, a) => () => fn(a);
@@ -47,19 +49,6 @@ const traversers = {
 const GET = '__';
 const get = (path, command) => path.get(command.replace(GET, ''));
 
-function initFormat(format) {
-    return {
-        indent: '    ',
-        newline: '\n',
-        space: ' ',
-        comments: true,
-        splitter: '\n',
-        roundBraceOpen: '(',
-        roundBraceClose: ')',
-        ...format,
-    };
-}
-
 const createAddToken = (tokens) => {
     const log = createLog();
     
@@ -69,8 +58,13 @@ const createAddToken = (tokens) => {
     };
 };
 
-module.exports.tokenize = (ast, overrides = {}) => {
-    const format = initFormat(overrides.format);
+module.exports.tokenize = (ast, overrides) => {
+    const {
+        visitors,
+        format,
+        semantics,
+    } = parseOverrides(overrides);
+    
     const tokens = [];
     const addToken = createAddToken(tokens);
     const debug = createDebug(tokens);
@@ -187,7 +181,7 @@ module.exports.tokenize = (ast, overrides = {}) => {
     
     const currentTraversers = {
         ...traversers,
-        ...overrides.visitors,
+        ...visitors,
     };
     
     if (ast.parentPath)
@@ -241,10 +235,10 @@ module.exports.tokenize = (ast, overrides = {}) => {
         const currentIndent = i;
         parseLeadingComments(path, printer, format);
         // this is main thing
-        maybePlugin(currentTraverse, path, printer);
-        
+        maybePlugin(currentTraverse, path, printer, semantics);
         parseTrailingComments(path, printer, format);
         maybeThrow(i !== currentIndent, path, `☝️Looks like indent level changed after token visitor: '{{ type }}', for code: '{{ path }}'`);
+        
         debug(path.type);
     }
     

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/printer",
-  "version": "1.143.0",
+  "version": "1.145.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Simplest possible opinionated Babel AST printer for 🐊Putout",