Revert to independent defaults

Author: karlhorky

docs/dataTypeCase.md

@@ -8,12 +8,10 @@ Note: Casing of function names like `VARCHAR(30)` are not modified - instead rel
 
 ## Options
 
-- `"preserve"` preserves the original case.
+- `"preserve"` (default) 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,12 +4,10 @@ Converts functions to upper- or lowercase.
 
 ## Options
 
-- `"preserve"` preserves the original case.
+- `"preserve"` (default) 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/sqlFormatter.ts

@@ -37,6 +37,21 @@ export type FormatOptionsWithDialect = Partial<FormatOptions> & {
   dialect: DialectOptions;
 };
 
+const defaultOptions: FormatOptions = {
+  tabWidth: 2,
+  useTabs: false,
+  keywordCase: 'preserve',
+  identifierCase: 'preserve',
+  dataTypeCase: 'preserve',
+  functionCase: 'preserve',
+  indentStyle: 'standard',
+  logicalOperatorNewline: 'before',
+  expressionWidth: 50,
+  linesBetweenQueries: 1,
+  denseOperators: false,
+  newlineBeforeSemicolon: false,
+};
+
 /**
  * Format whitespace in a query to make it easier to read.
  *
@@ -73,21 +88,6 @@ 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,