Add support for custom quote types (#516)

sql-formatter-org · Nov 5, 2022 · 15de546 · 15de546
2 parents 039f655 + a0aca28
commit 15de546
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 5 deletions.
diff --git a/src/lexer/TokenizerOptions.ts b/src/lexer/TokenizerOptions.ts
@@ -22,13 +22,13 @@ export interface PrefixedQuoteType {
   requirePrefix?: boolean; // True when prefix is required
 }
 
-export type QuoteType = PlainQuoteType | PrefixedQuoteType;
-
-export interface VariableRegex {
+export interface RegexPattern {
   regex: string;
 }
 
-export type VariableType = VariableRegex | PrefixedQuoteType;
+export type QuoteType = PlainQuoteType | PrefixedQuoteType | RegexPattern;
+
+export type VariableType = RegexPattern | PrefixedQuoteType;
 
 export interface ParamTypes {
   // True to allow for positional "?" parameter placeholders

diff --git a/src/lexer/regexFactory.ts b/src/lexer/regexFactory.ts
@@ -127,6 +127,8 @@ export const quotePatterns = {
 const singleQuotePattern = (quoteTypes: QuoteType): string => {
   if (typeof quoteTypes === 'string') {
     return quotePatterns[quoteTypes];
+  } else if ('regex' in quoteTypes) {
+    return quoteTypes.regex;
   } else {
     return prefixesPattern(quoteTypes) + quotePatterns[quoteTypes.quote];
   }

diff --git a/test/sqlFormatter.test.ts b/test/sqlFormatter.test.ts
@@ -1,6 +1,6 @@
 import dedent from 'dedent-js';
 
-import { format, formatDialect, SqlLanguage, sqlite } from '../src/index.js';
+import { format, formatDialect, SqlLanguage, sqlite, DialectOptions } from '../src/index.js';
 
 describe('sqlFormatter', () => {
   it('throws error when unsupported language parameter specified', () => {
@@ -63,5 +63,28 @@ describe('sqlFormatter', () => {
           \`bar\`;
       `);
     });
+
+    it('allows use of regex-based custom string type', () => {
+      // Extend SQLite dialect with additional string type
+      const sqliteWithTemplates: DialectOptions = {
+        tokenizerOptions: {
+          ...sqlite.tokenizerOptions,
+          stringTypes: [...sqlite.tokenizerOptions.stringTypes, { regex: String.raw`\{\{.*?\}\}` }],
+        },
+        formatOptions: sqlite.formatOptions,
+      };
+
+      expect(
+        formatDialect(`SELECT {{template item}}, 'normal string' FROM {{tbl}};`, {
+          dialect: sqliteWithTemplates,
+        })
+      ).toBe(dedent`
+        SELECT
+          {{template item}},
+          'normal string'
+        FROM
+          {{tbl}};
+      `);
+    });
   });
 });