Throw error when commaPosition or tabulateAlias option used

README.md

@@ -153,7 +153,6 @@ All fields are optional and all fields that are not specified will be filled wit
 - [**`identifierCase`**](docs/identifierCase.md) uppercases or lowercases identifiers. (**experimental!**)
 - [**`indentStyle`**](docs/indentStyle.md) defines overall indentation style.
 - [**`logicalOperatorNewline`**](docs/logicalOperatorNewline.md) newline before or after boolean operator (AND, OR, XOR).
-- [**`commaPosition`**](docs/commaPosition.md) where to place the comma in column lists (**deprecated!**).
 - [**`expressionWidth`**](docs/expressionWidth.md) maximum number of characters in parenthesized expressions to be kept on single line.
 - [**`linesBetweenQueries`**](docs/linesBetweenQueries.md) how many newlines to insert between queries.
 - [**`denseOperators`**](docs/denseOperators.md) packs operators densely without spaces.

src/FormatOptions.ts

@@ -8,8 +8,6 @@ export type KeywordCase = 'preserve' | 'upper' | 'lower';
 
 export type IdentifierCase = 'preserve' | 'upper' | 'lower';
 
-export type CommaPosition = 'before' | 'after' | 'tabular';
-
 export type LogicalOperatorNewline = 'before' | 'after';
 
 export interface FormatOptions {
@@ -19,7 +17,6 @@ export interface FormatOptions {
   identifierCase: IdentifierCase;
   indentStyle: IndentStyle;
   logicalOperatorNewline: LogicalOperatorNewline;
-  commaPosition: CommaPosition;
   expressionWidth: number;
   linesBetweenQueries: number;
   denseOperators: boolean;

src/formatter/Formatter.ts

@@ -6,7 +6,6 @@ import { createParser } from '../parser/createParser.js';
 import { StatementNode } from '../parser/ast.js';
 import { Dialect } from '../dialect.js';
 
-import formatCommaPositions from './formatCommaPositions.js';
 import ExpressionFormatter from './ExpressionFormatter.js';
 import Layout, { WS } from './Layout.js';
 import Indentation from './Indentation.js';
@@ -31,9 +30,7 @@ export default class Formatter {
   public format(query: string): string {
     const ast = this.parse(query);
     const formattedQuery = this.formatAst(ast);
-    const finalQuery = this.postFormat(formattedQuery);
-
-    return finalQuery.trimEnd();
+    return formattedQuery.trimEnd();
   }
 
   private parse(query: string): StatementNode[] {
@@ -63,12 +60,4 @@ export default class Formatter {
     }
     return layout.toString();
   }
-
-  private postFormat(query: string): string {
-    if (this.cfg.commaPosition === 'before' || this.cfg.commaPosition === 'tabular') {
-      query = formatCommaPositions(query, this.cfg.commaPosition, indentString(this.cfg));
-    }
-
-    return query;
-  }
 }

src/index.ts

@@ -17,7 +17,6 @@ export type {
   IndentStyle,
   KeywordCase,
   IdentifierCase,
-  CommaPosition,
   LogicalOperatorNewline,
   FormatOptions,
 } from './FormatOptions.js';

src/sqlFormatter.ts

@@ -44,7 +44,6 @@ const defaultOptions: FormatOptions = {
   identifierCase: 'preserve',
   indentStyle: 'standard',
   logicalOperatorNewline: 'before',
-  commaPosition: 'after',
   expressionWidth: 50,
   linesBetweenQueries: 1,
   denseOperators: false,

src/validateConfig.ts

@@ -16,19 +16,19 @@ export function validateConfig(cfg: FormatOptions): FormatOptions {
   if ('aliasAs' in cfg) {
     throw new ConfigError('aliasAs config is no more supported.');
   }
+  if ('commaPosition' in cfg) {
+    throw new ConfigError('commaPosition config is no more supported.');
+  }
+  if ('tabulateAlias' in cfg) {
+    throw new ConfigError('tabulateAlias config is no more supported.');
+  }
 
   if (cfg.expressionWidth <= 0) {
     throw new ConfigError(
       `expressionWidth config must be positive number. Received ${cfg.expressionWidth} instead.`
     );
   }
 
-  if (cfg.commaPosition === 'before' && cfg.useTabs) {
-    throw new ConfigError(
-      'commaPosition: before does not work when tabs are used for indentation.'
-    );
-  }
-
   if (cfg.params && !validateParams(cfg.params)) {
     // eslint-disable-next-line no-console
     console.warn('WARNING: All "params" option values should be strings.');

static/index.html

@@ -98,14 +98,6 @@ <h3 style="margin: 0.5rem 0">Options</h3>
               <option value="after">after</option>
             </select>
           </article>
-          <article class="config">
-            <label for="commaPosition">Comma position:</label>
-            <select id="commaPosition">
-              <option value="after">After</option>
-              <option value="before">Before</option>
-              <option value="tabular">Tabular</option>
-            </select>
-          </article>
           <article class="config">
             <label for="expressionWidth">Expression width:</label>
             <input

static/index.js

@@ -9,7 +9,6 @@ const attachFormat = () => {
   const keywordCase = document.getElementById('keywordCase');
   const indentStyle = document.getElementById('indentStyle');
   const logicalOperatorNewline = document.getElementById('logicalOperatorNewline');
-  const commaPosition = document.getElementById('commaPosition');
   const expressionWidth = document.getElementById('expressionWidth');
   const lineBetweenQueries = document.getElementById('lineBetweenQueries');
   const denseOperators = document.getElementById('denseOperators');
@@ -37,7 +36,6 @@ const attachFormat = () => {
         indentStyle: indentStyle.options[indentStyle.selectedIndex].value,
         logicalOperatorNewline:
           logicalOperatorNewline.options[logicalOperatorNewline.selectedIndex].value,
-        commaPosition: commaPosition.options[commaPosition.selectedIndex].value,
         expressionWidth: expressionWidth.value,
         lineBetweenQueries: lineBetweenQueries.value,
         denseOperators: denseOperators.checked,
@@ -72,7 +70,6 @@ const attachFormat = () => {
     keywordCase,
     indentStyle,
     logicalOperatorNewline,
-    commaPosition,
     expressionWidth,
     lineBetweenQueries,
     denseOperators,

test/behavesLikeSqlFormatter.ts

@@ -11,7 +11,6 @@ import supportsExpressionWidth from './options/expressionWidth.js';
 import supportsKeywordCase from './options/keywordCase.js';
 import supportsIdentifierCase from './options/identifierCase.js';
 import supportsIndentStyle from './options/indentStyle.js';
-import supportsCommaPosition from './options/commaPosition.js';
 import supportsLinesBetweenQueries from './options/linesBetweenQueries.js';
 import supportsNewlineBeforeSemicolon from './options/newlineBeforeSemicolon.js';
 import supportsLogicalOperatorNewline from './options/logicalOperatorNewline.js';
@@ -34,7 +33,6 @@ export default function behavesLikeSqlFormatter(format: FormatFn) {
   supportsLinesBetweenQueries(format);
   supportsExpressionWidth(format);
   supportsNewlineBeforeSemicolon(format);
-  supportsCommaPosition(format);
   supportsLogicalOperatorNewline(format);
   supportsParamTypes(format);
   supportsWindowFunctions(format);