Merge pull request #9 from inferrinizzard/feature/operator-spacing

Add flag for dense operator spacing

Author: inferrinizzard

src/core/Formatter.ts

@@ -143,6 +143,8 @@ export default class Formatter {
 				(token.value === '`' && this.tokenLookBehind(2)?.value === '`')
 			) {
 				formattedQuery = this.formatWithSpaces(token, formattedQuery, 'after');
+			} else if (token.type === tokenTypes.OPERATOR && this.cfg.denseOperators) {
+				formattedQuery = this.formatWithoutSpaces(token, formattedQuery);
 			} else {
 				if (this.cfg.aliasAs !== 'never') {
 					formattedQuery = this.formatAliases(token, formattedQuery);

src/sqlFormatter.ts

@@ -39,6 +39,7 @@ export interface FormatOptions {
 	aliasAs: 'always' | 'never' | 'select';
 	lineWidth: number;
 	linesBetweenQueries: number;
+	denseOperators: boolean;
 }
 /**
  * Format whitespace in a query to make it easier to read.
@@ -54,6 +55,7 @@ export interface FormatOptions {
  *  @param {String} cfg.aliasAs Whether to use AS in column aliases in only SELECT clause, both SELECT and table aliases, or never
  *  @param {Integer} cfg.lineWidth Number of characters in each line before breaking, default: 50
  *  @param {Integer} cfg.linesBetweenQueries How many line breaks between queries
+ *  @param {Boolean} cfg.denseOperators whether to format operators with spaces
  *  @param {ParamItems} cfg.params Collection of params for placeholder replacement
  * @return {String}
  */
@@ -92,6 +94,7 @@ export const format = (query: string, cfg: Partial<FormatOptions> = {}): string
 		newline: { mode: 'always' },
 		aliasAs: 'select',
 		lineWidth: 50,
+		denseOperators: false,
 	};
 	cfg = { ...defaultOptions, ...cfg };
 

test/features/operators.js

@@ -9,4 +9,10 @@ export default function supportsOperators(format, operators = []) {
 			expect(format(`foo${op}bar`)).toBe(`foo ${op} bar`);
 		});
 	});
+
+	operators.forEach(op => {
+		it(`supports ${op} operator in dense mode`, () => {
+			expect(format(`foo ${op} bar`, { denseOperators: true })).toBe(`foo${op}bar`);
+		});
+	});
 }