@slonik/sql-tag 43.0.1 → 43.0.3

package/src/types.ts

@@ -26,12 +26,16 @@ export type IntervalInput = {
   years?: number;
 };
 
-export type SqlFragment = {
+export type SqlFragmentToken = {
   readonly sql: string;
+  readonly type: typeof tokens.FragmentToken;
   readonly values: readonly PrimitiveValueExpression[];
 };
 
-export type ValueExpression = PrimitiveValueExpression | SqlFragment | SqlToken;
+export type ValueExpression =
+  | PrimitiveValueExpression
+  | SqlFragmentToken
+  | SqlToken;
 
 /**
  * "string" type covers all type name identifiers – the literal values are added only to assist developer
@@ -52,7 +56,7 @@ export type TypeNameIdentifier =
   | 'uuid';
 
 export type ArraySqlToken = {
-  readonly memberType: SqlToken | TypeNameIdentifier;
+  readonly memberType: SqlFragmentToken | TypeNameIdentifier;
   readonly type: typeof tokens.ArrayToken;
   readonly values: readonly PrimitiveValueExpression[];
 };
@@ -84,7 +88,7 @@ export type IntervalSqlToken = {
 };
 
 export type ListSqlToken = {
-  readonly glue: SqlFragment;
+  readonly glue: SqlFragmentToken;
   readonly members: readonly ValueExpression[];
   readonly type: typeof tokens.ListToken;
 };
@@ -114,7 +118,7 @@ export type TimestampSqlToken = {
 export type UnnestSqlToken = {
   readonly columnTypes:
     | Array<[...string[], TypeNameIdentifier]>
-    | Array<SqlFragment | TypeNameIdentifier>;
+    | Array<SqlFragmentToken | TypeNameIdentifier>;
   readonly tuples: ReadonlyArray<readonly ValueExpression[]>;
   readonly type: typeof tokens.UnnestToken;
 };
@@ -133,26 +137,28 @@ export type SqlToken =
   | TimestampSqlToken
   | UnnestSqlToken;
 
-export type SqlTag<Z extends Record<string, ZodTypeAny>> = {
+export type SqlTag<
+  Z extends Record<string, ZodTypeAny> = Record<string, ZodTypeAny>,
+> = {
   array: (
     values: readonly PrimitiveValueExpression[],
-    memberType: SqlFragment | TypeNameIdentifier,
+    memberType: SqlFragmentToken | TypeNameIdentifier,
   ) => ArraySqlToken;
   binary: (data: Buffer) => BinarySqlToken;
   date: (date: Date) => DateSqlToken;
   fragment: (
     template: TemplateStringsArray,
     ...values: ValueExpression[]
-  ) => SqlFragment;
+  ) => SqlFragmentToken;
   identifier: (names: readonly string[]) => IdentifierSqlToken;
   interval: (interval: IntervalInput) => IntervalSqlToken;
   join: (
     members: readonly ValueExpression[],
-    glue: SqlFragment,
+    glue: SqlFragmentToken,
   ) => ListSqlToken;
   json: (value: SerializableValue) => JsonSqlToken;
   jsonb: (value: SerializableValue) => JsonBinarySqlToken;
-  literalValue: (value: string) => SqlFragment;
+  literalValue: (value: string) => SqlFragmentToken;
   timestamp: (date: Date) => TimestampSqlToken;
   type: <Y extends ZodTypeAny>(
     parser: Y,
@@ -174,7 +180,7 @@ export type SqlTag<Z extends Record<string, ZodTypeAny>> = {
     tuples: ReadonlyArray<readonly any[]>,
     columnTypes:
       | Array<[...string[], TypeNameIdentifier]>
-      | Array<SqlFragment | TypeNameIdentifier>,
+      | Array<SqlFragmentToken | TypeNameIdentifier>,
   ) => UnnestSqlToken;
   unsafe: (
     template: TemplateStringsArray,