From fab05c05c21a82f8ebaa0882720fe42466c661ac Mon Sep 17 00:00:00 2001 From: Karl Horky Date: Mon, 27 Nov 2023 11:43:22 +0100 Subject: [PATCH] Fix types --- packages/sql/src/index.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/sql/src/index.ts b/packages/sql/src/index.ts index 561c5fc9..c1b0698b 100644 --- a/packages/sql/src/index.ts +++ b/packages/sql/src/index.ts @@ -4,7 +4,7 @@ import { JSOX } from 'jsox' import type { AST, Option } from 'node-sql-parser' import nodeSqlParser from 'node-sql-parser' import type { Options, ParserOptions, Plugin } from 'prettier' -import { format, type FormatOptions } from 'sql-formatter' +import { format, type FormatOptionsWithLanguage } from 'sql-formatter' import { languages } from './languages.js' @@ -21,8 +21,7 @@ const ENDINGS = { } as const export type SqlBaseOptions = Option & - Partial & { - language?: string + Partial & { formatter?: typeof NODE_SQL_PARSER | typeof SQL_CST | typeof SQL_FORMATTER params?: string paramTypes?: string @@ -68,11 +67,11 @@ const SqlPlugin: Plugin = { params: params == null ? undefined - : (JSOX.parse(params) as FormatOptions['params']), + : (JSOX.parse(params) as FormatOptionsWithLanguage['params']), paramTypes: paramTypes == null ? undefined - : (JSOX.parse(paramTypes) as FormatOptions['paramTypes']), + : (JSOX.parse(paramTypes) as FormatOptionsWithLanguage['paramTypes']), }) : parser.sqlify(value, { type, database })