Add functionCase option, make keywordCase default

Author: karlhorky

docs/dataTypeCase.md

@@ -8,10 +8,12 @@ Note: Casing of function names like `VARCHAR(30)` are not modified - instead rel
 
 ## Options
 
-- `"preserve"` (default) preserves the original case.
+- `"preserve"` preserves the original case.
 - `"upper"` converts to uppercase.
 - `"lower"` converts to lowercase.
 
+The default is either `options.keywordCase` (if you have set it) or `"preserve"`.
+
 ### preserve
 
 ```sql

docs/functionCase.md

@@ -4,10 +4,12 @@ Converts functions to upper- or lowercase.
 
 ## Options
 
-- `"preserve"` (default) preserves the original case.
+- `"preserve"` preserves the original case.
 - `"upper"` converts to uppercase.
 - `"lower"` converts to lowercase.
 
+The default is either `options.keywordCase` (if you have set it) or `"preserve"`.
+
 ### preserve
 
 ```sql

src/FormatOptions.ts

@@ -10,6 +10,8 @@ export type IdentifierCase = 'preserve' | 'upper' | 'lower';
 
 export type DataTypeCase = 'preserve' | 'upper' | 'lower';
 
+export type FunctionCase = 'preserve' | 'upper' | 'lower';
+
 export type LogicalOperatorNewline = 'before' | 'after';
 
 export interface FormatOptions {
@@ -18,6 +20,7 @@ export interface FormatOptions {
   keywordCase: KeywordCase;
   identifierCase: IdentifierCase;
   dataTypeCase: DataTypeCase;
+  functionCase: FunctionCase;
   indentStyle: IndentStyle;
   logicalOperatorNewline: LogicalOperatorNewline;
   expressionWidth: number;

src/formatter/ExpressionFormatter.ts

@@ -140,7 +140,7 @@ export default class ExpressionFormatter {
 
   private formatFunctionCall(node: FunctionCallNode) {
     this.withComments(node.nameKw, () => {
-      this.layout.add(this.showKw(node.nameKw));
+      this.layout.add(this.showFunctionKw(node.nameKw));
     });
     this.formatNode(node.parenthesis);
   }
@@ -518,6 +518,26 @@ export default class ExpressionFormatter {
     }
   }
 
+  private showFunctionKw(node: KeywordNode): string {
+    if (isTabularToken(node.tokenType)) {
+      return toTabularFormat(this.showNonTabularFunctionKw(node), this.cfg.indentStyle);
+    } else {
+      return this.showNonTabularFunctionKw(node);
+    }
+  }
+
+  // Like showFunctionKw(), but skips tabular formatting
+  private showNonTabularFunctionKw(node: KeywordNode): string {
+    switch (this.cfg.functionCase) {
+      case 'preserve':
+        return equalizeWhitespace(node.raw);
+      case 'upper':
+        return node.text;
+      case 'lower':
+        return node.text.toLowerCase();
+    }
+  }
+
   private showIdentifier(node: IdentifierNode): string {
     if (node.quoted) {
       return node.text;

src/lexer/Tokenizer.ts

@@ -1,10 +1,10 @@
-import { equalizeWhitespace, Optional } from '../utils.js';
-import { NestedComment } from './NestedComment.js';
-import * as regex from './regexFactory.js';
-import { escapeRegExp, patternToRegex } from './regexUtil.js';
 import { Token, TokenType } from './token.js';
-import TokenizerEngine, { TokenRule } from './TokenizerEngine.js';
+import * as regex from './regexFactory.js';
 import { ParamTypes, TokenizerOptions } from './TokenizerOptions.js';
+import TokenizerEngine, { TokenRule } from './TokenizerEngine.js';
+import { escapeRegExp, patternToRegex } from './regexUtil.js';
+import { equalizeWhitespace, Optional } from '../utils.js';
+import { NestedComment } from './NestedComment.js';
 
 type OptionalTokenRule = Optional<TokenRule, 'regex'>;
 

src/sqlFormatter.ts

@@ -1,6 +1,7 @@
 import * as allDialects from './allDialects.js';
-import { createDialect, DialectOptions } from './dialect.js';
+
 import { FormatOptions } from './FormatOptions.js';
+import { createDialect, DialectOptions } from './dialect.js';
 import Formatter from './formatter/Formatter.js';
 import { ConfigError, validateConfig } from './validateConfig.js';
 
@@ -36,20 +37,6 @@ export type FormatOptionsWithDialect = Partial<FormatOptions> & {
   dialect: DialectOptions;
 };
 
-const defaultOptions: FormatOptions = {
-  tabWidth: 2,
-  useTabs: false,
-  keywordCase: 'preserve',
-  identifierCase: 'preserve',
-  dataTypeCase: 'preserve',
-  indentStyle: 'standard',
-  logicalOperatorNewline: 'before',
-  expressionWidth: 50,
-  linesBetweenQueries: 1,
-  denseOperators: false,
-  newlineBeforeSemicolon: false,
-};
-
 /**
  * Format whitespace in a query to make it easier to read.
  *
@@ -86,6 +73,21 @@ export const formatDialect = (
     throw new Error('Invalid query argument. Expected string, instead got ' + typeof query);
   }
 
+  const defaultOptions: FormatOptions = {
+    tabWidth: 2,
+    useTabs: false,
+    keywordCase: 'preserve',
+    identifierCase: 'preserve',
+    dataTypeCase: cfg.keywordCase || 'preserve',
+    functionCase: cfg.keywordCase || 'preserve',
+    indentStyle: 'standard',
+    logicalOperatorNewline: 'before',
+    expressionWidth: 50,
+    linesBetweenQueries: 1,
+    denseOperators: false,
+    newlineBeforeSemicolon: false,
+  };
+
   const options = validateConfig({
     ...defaultOptions,
     ...cfg,

test/features/case.ts

@@ -79,7 +79,10 @@ export default function supportsCase(format: FormatFn) {
   it('properly converts to uppercase in case statements', () => {
     const result = format(
       "case trim(sqrt(my_field)) when 'one' then 1 when 'two' then 2 when 'three' then 3 else 4 end;",
-      { keywordCase: 'upper' }
+      {
+        keywordCase: 'upper',
+        functionCase: 'upper',
+      }
     );
     expect(result).toBe(dedent`
       CASE TRIM(SQRT(my_field))

test/snowflake.test.ts

@@ -167,7 +167,7 @@ describe('SnowflakeFormatter', () => {
     `);
   });
 
-  it('detects data types as data types', () => {
+  it('detects data types', () => {
     expect(
       format(
         `CREATE TABLE tbl (first_column double Precision, second_column numBer (38, 0), third String);`,