Make createSqlTag generic

gajus · Oct 20, 2020 · 40f8dde · 40f8dde
1 parent 3c8f54a
commit 40f8dde
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/factories/createSqlTag.ts b/src/factories/createSqlTag.ts
@@ -20,6 +20,7 @@ import type {
   JsonSqlTokenType,
   ListSqlTokenType,
   PrimitiveValueExpressionType,
+  QueryResultRowType,
   SerializableValueType,
   SqlSqlTokenType,
   SqlTaggedTemplateType,
@@ -38,10 +39,10 @@ const log = Logger.child({
   namespace: 'sql',
 });
 
-export default () => {
+export default <T = QueryResultRowType>() => {
   /* eslint-disable complexity */
   // @ts-ignore
-  const sql: SqlTaggedTemplateType = (
+  const sql: SqlTaggedTemplateType<T> = (
     parts: ReadonlyArray<string>,
     ...values: ReadonlyArray<ValueExpressionType>
   // eslint-disable-next-line unicorn/consistent-function-scoping

diff --git a/src/types.ts b/src/types.ts
@@ -320,8 +320,8 @@ export type NamedAssignmentType = {
 /**
  * see https://twitter.com/kuizinas/status/914139352908943360
  */
-export type SqlTaggedTemplateType = {
-  <T = QueryResultRowType>(template: TemplateStringsArray, ...vals: ValueExpressionType[]): TaggedTemplateLiteralInvocationType<T>;
+export type SqlTaggedTemplateType<T = QueryResultRowType> = {
+  <U = T>(template: TemplateStringsArray, ...vals: ValueExpressionType[]): TaggedTemplateLiteralInvocationType<U>;
   array: (
     values: ReadonlyArray<PrimitiveValueExpressionType>,
     memberType: TypeNameIdentifierType | SqlTokenType,