@slonik/sql-tag 43.0.1 → 43.0.3

package/dist/sqlFragmentFactories/createUnnestSqlFragment.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createUnnestSqlFragment = void 0;
+const tokens_1 = require("../tokens");
 const countArrayDimensions_1 = require("../utilities/countArrayDimensions");
 const escapeIdentifier_1 = require("../utilities/escapeIdentifier");
 const formatSlonikPlaceholder_1 = require("../utilities/formatSlonikPlaceholder");
@@ -74,6 +75,7 @@ const createUnnestSqlFragment = (token, greatestParameterPosition) => {
     const sql = 'unnest(' + unnestSqlTokens.join(', ') + ')';
     return {
         sql,
+        type: tokens_1.FragmentToken,
         values,
     };
 };

package/dist/sqlFragmentFactories/createUnnestSqlFragment.js.map

@@ -1 +1 @@
-{"version":3,"file":"createUnnestSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createUnnestSqlFragment.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createUnnestSqlFragment.js","sourceRoot":"","sources":["../../src/sqlFragmentFactories/createUnnestSqlFragment.ts"],"names":[],"mappings":"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"}

package/dist/types.d.ts

@@ -15,18 +15,19 @@ export type IntervalInput = {
     weeks?: number;
     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
  * experience with auto suggestions for commonly used type name identifiers.
  */
 export type TypeNameIdentifier = string | 'bool' | 'bytea' | 'float4' | 'float8' | 'int2' | 'int4' | 'int8' | 'json' | 'text' | 'timestamptz' | 'uuid';
 export type ArraySqlToken = {
-    readonly memberType: SqlToken | TypeNameIdentifier;
+    readonly memberType: SqlFragmentToken | TypeNameIdentifier;
     readonly type: typeof tokens.ArrayToken;
     readonly values: readonly PrimitiveValueExpression[];
 };
@@ -52,7 +53,7 @@ export type IntervalSqlToken = {
     readonly type: typeof tokens.IntervalToken;
 };
 export type ListSqlToken = {
-    readonly glue: SqlFragment;
+    readonly glue: SqlFragmentToken;
     readonly members: readonly ValueExpression[];
     readonly type: typeof tokens.ListToken;
 };
@@ -75,26 +76,26 @@ export type TimestampSqlToken = {
     readonly type: typeof tokens.TimestampToken;
 };
 export type UnnestSqlToken = {
-    readonly columnTypes: Array<[...string[], TypeNameIdentifier]> | Array<SqlFragment | TypeNameIdentifier>;
+    readonly columnTypes: Array<[...string[], TypeNameIdentifier]> | Array<SqlFragmentToken | TypeNameIdentifier>;
     readonly tuples: ReadonlyArray<readonly ValueExpression[]>;
     readonly type: typeof tokens.UnnestToken;
 };
 export type SqlToken = ArraySqlToken | BinarySqlToken | DateSqlToken | FragmentSqlToken | IdentifierSqlToken | IntervalSqlToken | JsonBinarySqlToken | JsonSqlToken | ListSqlToken | QuerySqlToken | TimestampSqlToken | UnnestSqlToken;
-export type SqlTag<Z extends Record<string, ZodTypeAny>> = {
-    array: (values: readonly PrimitiveValueExpression[], memberType: SqlFragment | TypeNameIdentifier) => ArraySqlToken;
+export type SqlTag<Z extends Record<string, ZodTypeAny> = Record<string, ZodTypeAny>> = {
+    array: (values: readonly PrimitiveValueExpression[], memberType: SqlFragmentToken | TypeNameIdentifier) => ArraySqlToken;
     binary: (data: Buffer) => BinarySqlToken;
     date: (date: Date) => DateSqlToken;
-    fragment: (template: TemplateStringsArray, ...values: ValueExpression[]) => SqlFragment;
+    fragment: (template: TemplateStringsArray, ...values: ValueExpression[]) => SqlFragmentToken;
     identifier: (names: readonly string[]) => IdentifierSqlToken;
     interval: (interval: IntervalInput) => IntervalSqlToken;
-    join: (members: readonly ValueExpression[], glue: SqlFragment) => ListSqlToken;
+    join: (members: readonly ValueExpression[], 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) => (template: TemplateStringsArray, ...values: ValueExpression[]) => QuerySqlToken<Y>;
     typeAlias: <K extends keyof Z>(typeAlias: K) => (template: TemplateStringsArray, ...values: ValueExpression[]) => QuerySqlToken<Z[K]>;
-    unnest: (tuples: ReadonlyArray<readonly any[]>, columnTypes: Array<[...string[], TypeNameIdentifier]> | Array<SqlFragment | TypeNameIdentifier>) => UnnestSqlToken;
+    unnest: (tuples: ReadonlyArray<readonly any[]>, columnTypes: Array<[...string[], TypeNameIdentifier]> | Array<SqlFragmentToken | TypeNameIdentifier>) => UnnestSqlToken;
     unsafe: (template: TemplateStringsArray, ...values: ValueExpression[]) => QuerySqlToken;
 };
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -16,8 +16,8 @@
     ]
   },
   "dependencies": {
-    "@slonik/errors": "^43.0.1",
-    "@slonik/types": "^43.0.1",
+    "@slonik/errors": "^43.0.3",
+    "@slonik/types": "^43.0.3",
     "roarr": "^7.21.1",
     "safe-stable-stringify": "^2.4.3",
     "serialize-error": "^8.0.0"
@@ -83,5 +83,5 @@
     "test": "nyc ava --verbose --serial"
   },
   "types": "./dist/index.d.ts",
-  "version": "43.0.1"
+  "version": "43.0.3"
 }

package/src/factories/createSqlTag.test/array.test.ts

@@ -97,6 +97,7 @@ test('throws if array member is not a primitive value expression', (t) => {
 
 test('throws if memberType is not a string or SqlToken of different type than "SLONIK_TOKEN_FRAGMENT"', (t) => {
   const error = t.throws(() => {
+    // @ts-expect-error - intentional
     sql.fragment`SELECT ${sql.array([1, 2, 3], sql.identifier(['int']))}`;
   });
 

package/src/factories/createSqlTag.test/unnest.test.ts

@@ -123,12 +123,7 @@ test('throws if tuple member is not a primitive value expression', (t) => {
   const error = t.throws(() => {
     sql.fragment`SELECT * FROM ${sql.unnest(
       [
-        [
-          // @ts-expect-error Intentional invalid value.
-          () => {},
-          2,
-          3,
-        ],
+        [() => {}, 2, 3],
         [4, 5],
       ],
       ['int4', 'int4', 'int4'],

package/src/factories/createSqlTag.ts

@@ -14,23 +14,8 @@ import {
   UnnestToken,
 } from '../tokens';
 import {
-  type ArraySqlToken,
-  type BinarySqlToken,
-  type DateSqlToken,
-  type FragmentSqlToken,
-  type IdentifierSqlToken,
-  type IntervalInput,
-  type IntervalSqlToken,
-  type JsonBinarySqlToken,
-  type JsonSqlToken,
-  type ListSqlToken,
   type PrimitiveValueExpression,
-  type SerializableValue,
-  type SqlFragment,
-  type SqlToken as SqlTokenType,
-  type TimestampSqlToken,
-  type TypeNameIdentifier,
-  type UnnestSqlToken,
+  type SqlTag,
   type ValueExpression,
 } from '../types';
 import { escapeLiteralValue } from '../utilities/escapeLiteralValue';
@@ -121,89 +106,80 @@ export const createSqlTag = <
   configuration: {
     typeAliases?: Z;
   } = {},
-) => {
+): SqlTag<Z> => {
   const typeAliases = configuration.typeAliases;
 
   return {
-    array: (
-      values: readonly PrimitiveValueExpression[],
-      memberType: SqlTokenType | TypeNameIdentifier,
-    ): ArraySqlToken => {
+    array: (values, memberType) => {
       return Object.freeze({
         memberType,
         type: ArrayToken,
         values,
       });
     },
-    binary: (data: Buffer): BinarySqlToken => {
+    binary: (data) => {
       return Object.freeze({
         data,
         type: BinaryToken,
       });
     },
-    date: (date: Date): DateSqlToken => {
+    date: (date) => {
       return Object.freeze({
         date,
         type: DateToken,
       });
     },
-    fragment: (
-      parts: readonly string[],
-      ...args: readonly ValueExpression[]
-    ): FragmentSqlToken => {
+    fragment: (parts, ...args) => {
       return Object.freeze({
         ...createFragment(parts, args),
         type: FragmentToken,
       });
     },
-    identifier: (names: readonly string[]): IdentifierSqlToken => {
+    identifier: (names) => {
       return Object.freeze({
         names,
         type: IdentifierToken,
       });
     },
-    interval: (interval: IntervalInput): IntervalSqlToken => {
+    interval: (interval) => {
       return Object.freeze({
         interval,
         type: IntervalToken,
       });
     },
-    join: (
-      members: readonly ValueExpression[],
-      glue: SqlFragment,
-    ): ListSqlToken => {
+    join: (members, glue) => {
       return Object.freeze({
         glue,
         members,
         type: ListToken,
       });
     },
-    json: (value: SerializableValue): JsonSqlToken => {
+    json: (value) => {
       return Object.freeze({
         type: JsonToken,
         value,
       });
     },
-    jsonb: (value: SerializableValue): JsonBinarySqlToken => {
+    jsonb: (value) => {
       return Object.freeze({
         type: JsonBinaryToken,
         value,
       });
     },
-    literalValue: (value: string): SqlFragment => {
+    literalValue: (value) => {
       return Object.freeze({
         sql: escapeLiteralValue(value),
         type: FragmentToken,
         values: [],
       });
     },
-    timestamp: (date: Date): TimestampSqlToken => {
+    timestamp: (date) => {
       return Object.freeze({
         date,
         type: TimestampToken,
       });
     },
-    type: <T extends ZodTypeAny>(parser: T) => {
+    type: (parser) => {
       return (
         parts: readonly string[],
         ...args: readonly ValueExpression[]
@@ -215,7 +191,7 @@ export const createSqlTag = <
         });
       };
     },
-    typeAlias: <Y extends keyof Z>(parserAlias: Y) => {
+    typeAlias: (parserAlias) => {
       if (!typeAliases?.[parserAlias]) {
         throw new Error(
           'Type alias "' + String(parserAlias) + '" does not exist.',
@@ -233,19 +209,14 @@ export const createSqlTag = <
         });
       };
     },
-    unnest: (
-      tuples: ReadonlyArray<readonly PrimitiveValueExpression[]>,
-      columnTypes:
-        | Array<[...string[], TypeNameIdentifier]>
-        | Array<SqlFragment | TypeNameIdentifier>,
-    ): UnnestSqlToken => {
+    unnest: (tuples, columnTypes) => {
       return Object.freeze({
         columnTypes,
         tuples,
         type: UnnestToken,
       });
     },
-    unsafe: (parts: readonly string[], ...args: readonly ValueExpression[]) => {
+    unsafe: (parts, ...args) => {
       return Object.freeze({
         ...createFragment(parts, args),
         parser: z.any(),

package/src/factories/createSqlTokenSqlFragment.ts

@@ -23,13 +23,13 @@ import {
   TimestampToken,
   UnnestToken,
 } from '../tokens';
-import { type SqlFragment, type SqlToken as SqlTokenType } from '../types';
+import { type SqlFragmentToken, type SqlToken as SqlTokenType } from '../types';
 import { UnexpectedStateError } from '@slonik/errors';
 
 export const createSqlTokenSqlFragment = (
   token: SqlTokenType,
   greatestParameterPosition: number,
-): SqlFragment => {
+): SqlFragmentToken => {
   if (token.type === ArrayToken) {
     return createArraySqlFragment(token, greatestParameterPosition);
   } else if (token.type === BinaryToken) {

package/src/index.ts

@@ -14,7 +14,7 @@ export {
   type PrimitiveValueExpression,
   type QuerySqlToken,
   type SerializableValue,
-  type SqlFragment,
+  type SqlFragmentToken,
   type SqlTag,
   type SqlToken,
   type TimestampSqlToken,

package/src/sqlFragmentFactories/createArraySqlFragment.ts

@@ -1,5 +1,6 @@
 import { createSqlTokenSqlFragment } from '../factories/createSqlTokenSqlFragment';
-import { type ArraySqlToken, type SqlFragment } from '../types';
+import { FragmentToken } from '../tokens';
+import { type ArraySqlToken, type SqlFragmentToken } from '../types';
 import { escapeIdentifier } from '../utilities/escapeIdentifier';
 import { formatSlonikPlaceholder } from '../utilities/formatSlonikPlaceholder';
 import { isPrimitiveValueExpression } from '../utilities/isPrimitiveValueExpression';
@@ -9,7 +10,7 @@ import { InvalidInputError, UnexpectedStateError } from '@slonik/errors';
 export const createArraySqlFragment = (
   token: ArraySqlToken,
   greatestParameterPosition: number,
-): SqlFragment => {
+): SqlFragmentToken => {
   let placeholderIndex = greatestParameterPosition;
 
   for (const value of token.values) {
@@ -62,6 +63,7 @@ export const createArraySqlFragment = (
 
   return {
     sql,
+    type: FragmentToken,
     values,
   };
 };

package/src/sqlFragmentFactories/createBinarySqlFragment.ts

@@ -1,17 +1,19 @@
-import { type BinarySqlToken, type SqlFragment } from '../types';
+import { FragmentToken } from '../tokens';
+import { type BinarySqlToken, type SqlFragmentToken } from '../types';
 import { formatSlonikPlaceholder } from '../utilities/formatSlonikPlaceholder';
 import { InvalidInputError } from '@slonik/errors';
 
 export const createBinarySqlFragment = (
   token: BinarySqlToken,
   greatestParameterPosition: number,
-): SqlFragment => {
+): SqlFragmentToken => {
   if (!Buffer.isBuffer(token.data)) {
     throw new InvalidInputError('Binary value must be a buffer.');
   }
 
   return {
     sql: formatSlonikPlaceholder(greatestParameterPosition + 1),
+    type: FragmentToken,
     values: [token.data],
   };
 };

package/src/sqlFragmentFactories/createDateSqlFragment.ts

@@ -1,11 +1,12 @@
-import { type DateSqlToken, type SqlFragment } from '../types';
+import { FragmentToken } from '../tokens';
+import { type DateSqlToken, type SqlFragmentToken } from '../types';
 import { formatSlonikPlaceholder } from '../utilities/formatSlonikPlaceholder';
 import { InvalidInputError } from '@slonik/errors';
 
 export const createDateSqlFragment = (
   token: DateSqlToken,
   greatestParameterPosition: number,
-): SqlFragment => {
+): SqlFragmentToken => {
   if (!(token.date instanceof Date)) {
     throw new InvalidInputError(
       'Date parameter value must be an instance of Date.',
@@ -14,6 +15,7 @@ export const createDateSqlFragment = (
 
   return {
     sql: formatSlonikPlaceholder(greatestParameterPosition + 1) + '::date',
+    type: FragmentToken,
     values: [token.date.toISOString().slice(0, 10)],
   };
 };

package/src/sqlFragmentFactories/createFragmentSqlFragment.ts

@@ -1,12 +1,13 @@
 import { slonikPlaceholderRegexRule } from '../regexRules/slonikPlaceholderRegexRule';
-import { type FragmentSqlToken, type SqlFragment } from '../types';
+import { FragmentToken } from '../tokens';
+import { type FragmentSqlToken, type SqlFragmentToken } from '../types';
 import { formatSlonikPlaceholder } from '../utilities/formatSlonikPlaceholder';
 import { UnexpectedStateError } from '@slonik/errors';
 
 export const createFragmentSqlFragment = (
   token: FragmentSqlToken,
   greatestParameterPosition: number,
-): SqlFragment => {
+): SqlFragmentToken => {
   let sql = '';
 
   let leastMatchedParameterPosition = Number.POSITIVE_INFINITY;
@@ -43,6 +44,7 @@ export const createFragmentSqlFragment = (
 
   return {
     sql,
+    type: FragmentToken,
     values: token.values,
   };
 };

package/src/sqlFragmentFactories/createIdentifierSqlFragment.ts

@@ -1,10 +1,11 @@
-import { type IdentifierSqlToken, type SqlFragment } from '../types';
+import { FragmentToken } from '../tokens';
+import { type IdentifierSqlToken, type SqlFragmentToken } from '../types';
 import { escapeIdentifier } from '../utilities/escapeIdentifier';
 import { InvalidInputError } from '@slonik/errors';
 
 export const createIdentifierSqlFragment = (
   token: IdentifierSqlToken,
-): SqlFragment => {
+): SqlFragmentToken => {
   const sql = token.names
     .map((identifierName) => {
       if (typeof identifierName !== 'string') {
@@ -19,6 +20,7 @@ export const createIdentifierSqlFragment = (
 
   return {
     sql,
+    type: FragmentToken,
     values: [],
   };
 };

package/src/sqlFragmentFactories/createIntervalSqlFragment.ts

@@ -1,4 +1,5 @@
-import { type IntervalSqlToken, type SqlFragment } from '../types';
+import { FragmentToken } from '../tokens';
+import { type IntervalSqlToken, type SqlFragmentToken } from '../types';
 import { formatSlonikPlaceholder } from '../utilities/formatSlonikPlaceholder';
 import { InvalidInputError } from '@slonik/errors';
 import { z } from 'zod';
@@ -33,7 +34,7 @@ const tokenMap = {
 export const createIntervalSqlFragment = (
   token: IntervalSqlToken,
   greatestParameterPosition: number,
-): SqlFragment => {
+): SqlFragmentToken => {
   let intervalInput;
 
   try {
@@ -66,6 +67,7 @@ export const createIntervalSqlFragment = (
 
   return {
     sql: 'make_interval(' + intervalTokens.join(', ') + ')',
+    type: FragmentToken,
     values,
   };
 };

package/src/sqlFragmentFactories/createJsonSqlFragment.ts

@@ -1,8 +1,9 @@
 import { Logger } from '../Logger';
+import { FragmentToken } from '../tokens';
 import {
   type JsonBinarySqlToken,
   type JsonSqlToken,
-  type SqlFragment,
+  type SqlFragmentToken,
 } from '../types';
 import { formatSlonikPlaceholder } from '../utilities/formatSlonikPlaceholder';
 import { isPlainObject } from '../utilities/isPlainObject';
@@ -18,7 +19,7 @@ export const createJsonSqlFragment = (
   token: JsonBinarySqlToken | JsonSqlToken,
   greatestParameterPosition: number,
   binary: boolean,
-): SqlFragment => {
+): SqlFragmentToken => {
   let value;
 
   if (token.value === undefined) {
@@ -61,6 +62,7 @@ export const createJsonSqlFragment = (
       formatSlonikPlaceholder(greatestParameterPosition + 1) +
       '::' +
       (binary ? 'jsonb' : 'json'),
+    type: FragmentToken,
     values: [value],
   };
 };

package/src/sqlFragmentFactories/createListSqlFragment.ts

@@ -1,9 +1,10 @@
 import { createPrimitiveValueExpressions } from '../factories/createPrimitiveValueExpressions';
 import { createSqlTokenSqlFragment } from '../factories/createSqlTokenSqlFragment';
+import { FragmentToken } from '../tokens';
 import {
   type ListSqlToken,
   type PrimitiveValueExpression,
-  type SqlFragment,
+  type SqlFragmentToken,
 } from '../types';
 import { formatSlonikPlaceholder } from '../utilities/formatSlonikPlaceholder';
 import { isPrimitiveValueExpression } from '../utilities/isPrimitiveValueExpression';
@@ -13,7 +14,7 @@ import { InvalidInputError } from '@slonik/errors';
 export const createListSqlFragment = (
   token: ListSqlToken,
   greatestParameterPosition: number,
-): SqlFragment => {
+): SqlFragmentToken => {
   const values: PrimitiveValueExpression[] = [];
   const placeholders: Array<PrimitiveValueExpression | null> = [];
 
@@ -43,6 +44,7 @@ export const createListSqlFragment = (
 
   return {
     sql: placeholders.join(token.glue.sql),
+    type: FragmentToken,
     values: createPrimitiveValueExpressions(values),
   };
 };

package/src/sqlFragmentFactories/createQuerySqlFragment.ts

@@ -1,12 +1,13 @@
 import { slonikPlaceholderRegexRule } from '../regexRules/slonikPlaceholderRegexRule';
-import { type QuerySqlToken, type SqlFragment } from '../types';
+import { FragmentToken } from '../tokens';
+import { type QuerySqlToken, type SqlFragmentToken } from '../types';
 import { formatSlonikPlaceholder } from '../utilities/formatSlonikPlaceholder';
 import { UnexpectedStateError } from '@slonik/errors';
 
 export const createQuerySqlFragment = (
   token: QuerySqlToken,
   greatestParameterPosition: number,
-): SqlFragment => {
+): SqlFragmentToken => {
   let sql = '';
 
   let leastMatchedParameterPosition = Number.POSITIVE_INFINITY;
@@ -43,6 +44,7 @@ export const createQuerySqlFragment = (
 
   return {
     sql,
+    type: FragmentToken,
     values: token.values,
   };
 };

package/src/sqlFragmentFactories/createTimestampSqlFragment.ts

@@ -1,11 +1,12 @@
-import { type SqlFragment, type TimestampSqlToken } from '../types';
+import { FragmentToken } from '../tokens';
+import { type SqlFragmentToken, type TimestampSqlToken } from '../types';
 import { formatSlonikPlaceholder } from '../utilities/formatSlonikPlaceholder';
 import { InvalidInputError } from '@slonik/errors';
 
 export const createTimestampSqlFragment = (
   token: TimestampSqlToken,
   greatestParameterPosition: number,
-): SqlFragment => {
+): SqlFragmentToken => {
   if (!(token.date instanceof Date)) {
     throw new InvalidInputError(
       'Timestamp parameter value must be an instance of Date.',
@@ -17,6 +18,7 @@ export const createTimestampSqlFragment = (
       'to_timestamp(' +
       formatSlonikPlaceholder(greatestParameterPosition + 1) +
       ')',
+    type: FragmentToken,
     values: [String(token.date.getTime() / 1_000)],
   };
 };

package/src/sqlFragmentFactories/createUnnestSqlFragment.ts

@@ -1,6 +1,7 @@
+import { FragmentToken } from '../tokens';
 import {
   type PrimitiveValueExpression,
-  type SqlFragment,
+  type SqlFragmentToken,
   type UnnestSqlToken,
 } from '../types';
 import { countArrayDimensions } from '../utilities/countArrayDimensions';
@@ -13,7 +14,7 @@ import { InvalidInputError } from '@slonik/errors';
 export const createUnnestSqlFragment = (
   token: UnnestSqlToken,
   greatestParameterPosition: number,
-): SqlFragment => {
+): SqlFragmentToken => {
   const { columnTypes } = token;
 
   const values: PrimitiveValueExpression[] = [];
@@ -113,6 +114,7 @@ export const createUnnestSqlFragment = (
 
   return {
     sql,
+    type: FragmentToken,
     values,
   };
 };