Add .raw property to tagged template fn call

Author: tjenkinson

src/query-builder.ts

@@ -49,7 +49,7 @@ export type FragmentBuilder = {
    * This is intended to take a tagged template tag function.
    */
   toTaggedTemplate: <T>(
-    tag: (strings: string[], ...bindings: string[]) => T,
+    tag: (strings: TemplateStringsArray, ...bindings: string[]) => T,
   ) => T;
   toRaw: () => RawFragment;
 };
@@ -114,11 +114,14 @@ export class QueryBuilder {
         };
       },
       toTaggedTemplate: <T>(
-        tag: (strings: string[], ..._bindings: string[]) => T,
+        tag: (strings: TemplateStringsArray, ..._bindings: string[]) => T,
       ) => {
         onUsage();
 
-        return tag(buildStrings(), ...bindings);
+        const raw = buildStrings();
+        const strings = [...raw] as string[] & { raw: string[] };
+        strings.raw = raw;
+        return tag(strings, ...bindings);
       },
       withArrayBindings: ({ placeholder: userPlaceholder = '?' } = {}) => {
         if (typeof userPlaceholder !== 'function') {

src/sql-cursor-pagination.test.ts

@@ -112,10 +112,14 @@ describe('SqlCursorPagination', () => {
         }),
       ).toMatchSnapshot();
       expect(
-        builder.toTaggedTemplate((strings, ...bindings) => ({
-          bindings,
-          strings,
-        })),
+        builder.toTaggedTemplate((strings, ...bindings) => {
+          expect(Array.isArray(strings)).toBe(true);
+          expect(strings.raw).toStrictEqual([...strings]);
+          return {
+            bindings,
+            strings,
+          };
+        }),
       ).toMatchSnapshot();
     };