@drttix/drt-sdk 1.5.1 → 2.0.0

package/src/generated/shopper/core/request.ts

@@ -1,421 +1,425 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-import { ApiError } from "./ApiError";
-import type { ApiRequestOptions } from "./ApiRequestOptions";
-import type { ApiResult } from "./ApiResult";
-import { CancelablePromise } from "./CancelablePromise";
-import type { OnCancel } from "./CancelablePromise";
-import type { OpenAPIConfig } from "./OpenAPI";
-
-export const isDefined = <T>(
-	value: T | null | undefined
-): value is Exclude<T, null | undefined> => {
-	return value !== undefined && value !== null;
-};
-
-export const isString = (value: any): value is string => {
-	return typeof value === "string";
-};
-
-export const isStringWithValue = (value: any): value is string => {
-	return isString(value) && value !== "";
-};
-
-export const isBlob = (value: any): value is Blob => {
-	return (
-		typeof value === "object" &&
-		typeof value.type === "string" &&
-		typeof value.stream === "function" &&
-		typeof value.arrayBuffer === "function" &&
-		typeof value.constructor === "function" &&
-		typeof value.constructor.name === "string" &&
-		/^(Blob|File)$/.test(value.constructor.name) &&
-		/^(Blob|File)$/.test(value[Symbol.toStringTag])
-	);
-};
-
-export const isFormData = (value: any): value is FormData => {
-	return value instanceof FormData;
-};
-
-export const base64 = (str: string): string => {
-	try {
-		return btoa(str);
-	} catch (err) {
-		// @ts-ignore
-		return Buffer.from(str).toString("base64");
-	}
-};
-
-export const getQueryString = (params: Record<string, any>): string => {
-	const qs: string[] = [];
-
-	const append = (key: string, value: any) => {
-		qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);
-	};
-
-	const process = (key: string, value: any) => {
-		if (isDefined(value)) {
-			if (Array.isArray(value)) {
-				value.forEach((v) => {
-					process(key, v);
-				});
-			} else if (typeof value === "object") {
-				Object.entries(value).forEach(([k, v]) => {
-					process(`${key}[${k}]`, v);
-				});
-			} else {
-				append(key, value);
-			}
-		}
-	};
-
-	Object.entries(params).forEach(([key, value]) => {
-		process(key, value);
-	});
-
-	if (qs.length > 0) {
-		return `?${qs.join("&")}`;
-	}
-
-	return "";
-};
-
-const getUrl = (config: OpenAPIConfig, options: ApiRequestOptions): string => {
-	const encoder = config.ENCODE_PATH || encodeURI;
-
-	const path = options.url
-		.replace("{api-version}", config.VERSION)
-		.replace(/{(.*?)}/g, (substring: string, group: string) => {
-			if (options.path?.hasOwnProperty(group)) {
-				return encoder(String(options.path[group]));
-			}
-			return substring;
-		});
-
-	const url = `${config.BASE}${path}`;
-	if (options.query) {
-		return `${url}${getQueryString(options.query)}`;
-	}
-	return url;
-};
-
-export const getFormData = (
-	options: ApiRequestOptions
-): FormData | undefined => {
-	if (options.formData) {
-		const formData = new FormData();
-
-		const process = (key: string, value: any) => {
-			if (isString(value) || isBlob(value)) {
-				formData.append(key, value);
-			} else {
-				formData.append(key, JSON.stringify(value));
-			}
-		};
-
-		Object.entries(options.formData)
-			.filter(([_, value]) => isDefined(value))
-			.forEach(([key, value]) => {
-				if (Array.isArray(value)) {
-					value.forEach((v) => process(key, v));
-				} else {
-					process(key, value);
-				}
-			});
-
-		return formData;
-	}
-	return undefined;
-};
-
-type Resolver<T> = (options: ApiRequestOptions) => Promise<T>;
-
-export const resolve = async <T>(
-	options: ApiRequestOptions,
-	resolver?: T | Resolver<T>
-): Promise<T | undefined> => {
-	if (typeof resolver === "function") {
-		return (resolver as Resolver<T>)(options);
-	}
-	return resolver;
-};
-
-export const getHeaders = async (
-	config: OpenAPIConfig,
-	options: ApiRequestOptions
-): Promise<Headers> => {
-	const [token, username, password, additionalHeaders] = await Promise.all([
-		resolve(options, config.TOKEN),
-		resolve(options, config.USERNAME),
-		resolve(options, config.PASSWORD),
-		resolve(options, config.HEADERS),
-	]);
-
-	// Filter out undefined/null values from options.headers first
-	const optionsHeaders = Object.fromEntries(
-		Object.entries(options.headers || {}).filter(([_, value]) => isDefined(value))
-	);
-
-	const headers = Object.entries({
-		Accept: "application/json",
-		...optionsHeaders,
-		...additionalHeaders, // config.HEADERS takes precedence when set (for DRT.init())
-	})
-		.filter(([_, value]) => isDefined(value))
-		.reduce(
-			(headers, [key, value]) => ({
-				...headers,
-				[key]: String(value),
-			}),
-			{} as Record<string, string>
-		);
-
-	if (isStringWithValue(token)) {
-		headers["Authorization"] = `Bearer ${token}`;
-	}
-
-	if (isStringWithValue(username) && isStringWithValue(password)) {
-		const credentials = base64(`${username}:${password}`);
-		headers["Authorization"] = `Basic ${credentials}`;
-	}
-
-	if (options.body !== undefined) {
-		if (options.mediaType) {
-			headers["Content-Type"] = options.mediaType;
-		} else if (isBlob(options.body)) {
-			headers["Content-Type"] = options.body.type || "application/octet-stream";
-		} else if (isString(options.body)) {
-			headers["Content-Type"] = "text/plain";
-		} else if (!isFormData(options.body)) {
-			headers["Content-Type"] = "application/json";
-		}
-	}
-
-	return new Headers(headers);
-};
-
-export const getRequestBody = (options: ApiRequestOptions): any => {
-	if (options.body !== undefined) {
-		if (options.mediaType?.includes("/json")) {
-			return JSON.stringify(options.body);
-		} else if (
-			isString(options.body) ||
-			isBlob(options.body) ||
-			isFormData(options.body)
-		) {
-			return options.body;
-		} else {
-			return JSON.stringify(options.body);
-		}
-	}
-	return undefined;
-};
-
-export const sendRequest = async (
-	config: OpenAPIConfig,
-	options: ApiRequestOptions,
-	url: string,
-	body: any,
-	formData: FormData | undefined,
-	headers: Headers,
-	onCancel: OnCancel
-): Promise<Response> => {
-	const controller = new AbortController();
-
-	const request: RequestInit = {
-		headers,
-		body: body ?? formData,
-		method: options.method,
-		signal: controller.signal,
-	};
-
-	if (config.WITH_CREDENTIALS) {
-		request.credentials = config.CREDENTIALS;
-	}
-
-	onCancel(() => controller.abort());
-
-	return await fetch(url, request);
-};
-
-export const getResponseHeader = (
-	response: Response,
-	responseHeader?: string
-): string | undefined => {
-	if (responseHeader) {
-		const content = response.headers.get(responseHeader);
-		if (isString(content)) {
-			return content;
-		}
-	}
-	return undefined;
-};
-
-export const getResponseBody = async (response: Response): Promise<any> => {
-	if (response.status !== 204) {
-		try {
-			const contentType = response.headers.get("Content-Type");
-			if (contentType) {
-				const jsonTypes = ["application/json", "application/problem+json"];
-				const lc = contentType.toLowerCase();
-				const isJSON = jsonTypes.some((type) => lc.startsWith(type));
-				if (isJSON) {
-					return await response.json();
-				}
-				// Return Blob for PDF / binary responses
-				if (lc.startsWith('application/pdf') || lc.startsWith('application/octet-stream')) {
-					return await response.blob();
-				}
-				return await response.text();
-			}
-		} catch (error) {
-			console.error(error);
-		}
-	}
-	return undefined;
-};
-
-export const catchErrorCodes = (
-	options: ApiRequestOptions,
-	result: ApiResult
-): void => {
-	const errors: Record<number, string> = {
-		400: "Bad Request",
-		401: "Unauthorized",
-		403: "Forbidden",
-		404: "Not Found",
-		500: "Internal Server Error",
-		502: "Bad Gateway",
-		503: "Service Unavailable",
-		...options.errors,
-	};
-
-	const error = errors[result.status];
-	if (error) {
-		throw new ApiError(options, result, error);
-	}
-
-	if (!result.ok) {
-		const errorStatus = result.status ?? "unknown";
-		const errorStatusText = result.statusText ?? "unknown";
-		const errorBody = (() => {
-			try {
-				return JSON.stringify(result.body, null, 2);
-			} catch (e) {
-				return undefined;
-			}
-		})();
-
-		throw new ApiError(
-			options,
-			result,
-			`Generic Error: status: ${errorStatus}; status text: ${errorStatusText}; body: ${errorBody}`
-		);
-	}
-};
-
-// Cookies are cached per request "identity" rather than in one shared slot.
-// Shopper calls carry shopperguid/accountid in options.headers (resolved
-// per-call by resolveShopperHeaders()), so each shopper gets its own cookie
-// jar instead of one shopper's session leaking into another's requests when
-// a single SDK instance serves many shoppers concurrently (shopperScope:
-// 'per-request'). Portal/scanner calls carry no such header and fall back to
-// the single default slot, matching prior behavior.
-const DEFAULT_COOKIE_KEY = "__default__";
-const MAX_COOKIE_ENTRIES = 10_000;
-const cookiesByKey = new Map<string, string>();
-
-const getCookieKey = (options: ApiRequestOptions): string => {
-	const shopperguid = options.headers?.["shopperguid"];
-	const accountid = options.headers?.["accountid"];
-	if (isStringWithValue(shopperguid)) {
-		return `${shopperguid}:${isStringWithValue(accountid) ? accountid : ""}`;
-	}
-	return DEFAULT_COOKIE_KEY;
-};
-
-const storeCookie = (key: string, value: string): void => {
-	if (!cookiesByKey.has(key) && cookiesByKey.size >= MAX_COOKIE_ENTRIES) {
-		// Evict the oldest entry (Map preserves insertion order) to bound memory
-		// on a long-running, many-shopper backend process.
-		const oldestKey = cookiesByKey.keys().next().value;
-		if (oldestKey !== undefined) {
-			cookiesByKey.delete(oldestKey);
-		}
-	}
-	cookiesByKey.set(key, value);
-};
-
-/**
- * Wraps sendRequest to capture cookies on login
- * and attach cookies on other requests
- */
-export const request = <T>(
-	config: OpenAPIConfig,
-	options: ApiRequestOptions
-): CancelablePromise<T> => {
-	return new CancelablePromise(async (resolve, reject, onCancel) => {
-		try {
-			const url = getUrl(config, options);
-			const formData = getFormData(options);
-			const body = getRequestBody(options);
-			const cookieKey = getCookieKey(options);
-
-			// Before making headers, possibly attach cookie if we have it
-			const baseHeaders = await getHeaders(config, options);
-			// We will build combined headers
-			const headerObj: Record<string, string> = {};
-			baseHeaders.forEach((value, key) => {
-				headerObj[key] = value;
-			});
-			const storedCookie = cookiesByKey.get(cookieKey);
-			if (storedCookie) {
-				// Attach stored cookie
-				headerObj["Cookie"] = storedCookie;
-			}
-			const headers = new Headers(headerObj);
-
-			if (!onCancel.isCancelled) {
-				const response = await sendRequest(
-					config,
-					options,
-					url,
-					body,
-					formData,
-					headers,
-					onCancel
-				);
-
-				// Capture Set-Cookie if present
-				const setCookie = response.headers.get("set-cookie");
-				if (setCookie) {
-					// Overwrite or append as needed
-					storeCookie(cookieKey, setCookie);
-				}
-
-				const responseBody = await getResponseBody(response);
-				const responseHeader = getResponseHeader(
-					response,
-					options.responseHeader
-				);
-
-				const result: ApiResult = {
-					url,
-					ok: response.ok,
-					status: response.status,
-					statusText: response.statusText,
-					body: responseHeader ?? responseBody,
-				};
-
-				catchErrorCodes(options, result);
-
-				resolve(result.body as T);
-			}
-		} catch (error) {
-			reject(error);
-		}
-	});
-};
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+import { ApiError } from "./ApiError";
+import type { ApiRequestOptions } from "./ApiRequestOptions";
+import type { ApiResult } from "./ApiResult";
+import { CancelablePromise } from "./CancelablePromise";
+import type { OnCancel } from "./CancelablePromise";
+import type { OpenAPIConfig } from "./OpenAPI";
+// Every service's request.ts is this same template (build-all.ts copies it),
+// so this one check is what makes DRT.init() mandatory SDK-wide.
+import { assertInitialized } from "../../../functions/sdkConfig";
+
+export const isDefined = <T>(
+	value: T | null | undefined
+): value is Exclude<T, null | undefined> => {
+	return value !== undefined && value !== null;
+};
+
+export const isString = (value: any): value is string => {
+	return typeof value === "string";
+};
+
+export const isStringWithValue = (value: any): value is string => {
+	return isString(value) && value !== "";
+};
+
+export const isBlob = (value: any): value is Blob => {
+	return (
+		typeof value === "object" &&
+		typeof value.type === "string" &&
+		typeof value.stream === "function" &&
+		typeof value.arrayBuffer === "function" &&
+		typeof value.constructor === "function" &&
+		typeof value.constructor.name === "string" &&
+		/^(Blob|File)$/.test(value.constructor.name) &&
+		/^(Blob|File)$/.test(value[Symbol.toStringTag])
+	);
+};
+
+export const isFormData = (value: any): value is FormData => {
+	return value instanceof FormData;
+};
+
+export const base64 = (str: string): string => {
+	try {
+		return btoa(str);
+	} catch (err) {
+		// @ts-ignore
+		return Buffer.from(str).toString("base64");
+	}
+};
+
+export const getQueryString = (params: Record<string, any>): string => {
+	const qs: string[] = [];
+
+	const append = (key: string, value: any) => {
+		qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);
+	};
+
+	const process = (key: string, value: any) => {
+		if (isDefined(value)) {
+			if (Array.isArray(value)) {
+				value.forEach((v) => {
+					process(key, v);
+				});
+			} else if (typeof value === "object") {
+				Object.entries(value).forEach(([k, v]) => {
+					process(`${key}[${k}]`, v);
+				});
+			} else {
+				append(key, value);
+			}
+		}
+	};
+
+	Object.entries(params).forEach(([key, value]) => {
+		process(key, value);
+	});
+
+	if (qs.length > 0) {
+		return `?${qs.join("&")}`;
+	}
+
+	return "";
+};
+
+const getUrl = (config: OpenAPIConfig, options: ApiRequestOptions): string => {
+	const encoder = config.ENCODE_PATH || encodeURI;
+
+	const path = options.url
+		.replace("{api-version}", config.VERSION)
+		.replace(/{(.*?)}/g, (substring: string, group: string) => {
+			if (options.path?.hasOwnProperty(group)) {
+				return encoder(String(options.path[group]));
+			}
+			return substring;
+		});
+
+	const url = `${config.BASE}${path}`;
+	if (options.query) {
+		return `${url}${getQueryString(options.query)}`;
+	}
+	return url;
+};
+
+export const getFormData = (
+	options: ApiRequestOptions
+): FormData | undefined => {
+	if (options.formData) {
+		const formData = new FormData();
+
+		const process = (key: string, value: any) => {
+			if (isString(value) || isBlob(value)) {
+				formData.append(key, value);
+			} else {
+				formData.append(key, JSON.stringify(value));
+			}
+		};
+
+		Object.entries(options.formData)
+			.filter(([_, value]) => isDefined(value))
+			.forEach(([key, value]) => {
+				if (Array.isArray(value)) {
+					value.forEach((v) => process(key, v));
+				} else {
+					process(key, value);
+				}
+			});
+
+		return formData;
+	}
+	return undefined;
+};
+
+type Resolver<T> = (options: ApiRequestOptions) => Promise<T>;
+
+export const resolve = async <T>(
+	options: ApiRequestOptions,
+	resolver?: T | Resolver<T>
+): Promise<T | undefined> => {
+	if (typeof resolver === "function") {
+		return (resolver as Resolver<T>)(options);
+	}
+	return resolver;
+};
+
+export const getHeaders = async (
+	config: OpenAPIConfig,
+	options: ApiRequestOptions
+): Promise<Headers> => {
+	const [token, username, password, additionalHeaders] = await Promise.all([
+		resolve(options, config.TOKEN),
+		resolve(options, config.USERNAME),
+		resolve(options, config.PASSWORD),
+		resolve(options, config.HEADERS),
+	]);
+
+	// Filter out undefined/null values from options.headers first
+	const optionsHeaders = Object.fromEntries(
+		Object.entries(options.headers || {}).filter(([_, value]) => isDefined(value))
+	);
+
+	const headers = Object.entries({
+		Accept: "application/json",
+		...optionsHeaders,
+		...additionalHeaders, // config.HEADERS takes precedence when set (for DRT.init())
+	})
+		.filter(([_, value]) => isDefined(value))
+		.reduce(
+			(headers, [key, value]) => ({
+				...headers,
+				[key]: String(value),
+			}),
+			{} as Record<string, string>
+		);
+
+	if (isStringWithValue(token)) {
+		headers["Authorization"] = `Bearer ${token}`;
+	}
+
+	if (isStringWithValue(username) && isStringWithValue(password)) {
+		const credentials = base64(`${username}:${password}`);
+		headers["Authorization"] = `Basic ${credentials}`;
+	}
+
+	if (options.body !== undefined) {
+		if (options.mediaType) {
+			headers["Content-Type"] = options.mediaType;
+		} else if (isBlob(options.body)) {
+			headers["Content-Type"] = options.body.type || "application/octet-stream";
+		} else if (isString(options.body)) {
+			headers["Content-Type"] = "text/plain";
+		} else if (!isFormData(options.body)) {
+			headers["Content-Type"] = "application/json";
+		}
+	}
+
+	return new Headers(headers);
+};
+
+export const getRequestBody = (options: ApiRequestOptions): any => {
+	if (options.body !== undefined) {
+		if (options.mediaType?.includes("/json")) {
+			return JSON.stringify(options.body);
+		} else if (
+			isString(options.body) ||
+			isBlob(options.body) ||
+			isFormData(options.body)
+		) {
+			return options.body;
+		} else {
+			return JSON.stringify(options.body);
+		}
+	}
+	return undefined;
+};
+
+export const sendRequest = async (
+	config: OpenAPIConfig,
+	options: ApiRequestOptions,
+	url: string,
+	body: any,
+	formData: FormData | undefined,
+	headers: Headers,
+	onCancel: OnCancel
+): Promise<Response> => {
+	const controller = new AbortController();
+
+	const request: RequestInit = {
+		headers,
+		body: body ?? formData,
+		method: options.method,
+		signal: controller.signal,
+	};
+
+	if (config.WITH_CREDENTIALS) {
+		request.credentials = config.CREDENTIALS;
+	}
+
+	onCancel(() => controller.abort());
+
+	return await fetch(url, request);
+};
+
+export const getResponseHeader = (
+	response: Response,
+	responseHeader?: string
+): string | undefined => {
+	if (responseHeader) {
+		const content = response.headers.get(responseHeader);
+		if (isString(content)) {
+			return content;
+		}
+	}
+	return undefined;
+};
+
+export const getResponseBody = async (response: Response): Promise<any> => {
+	if (response.status !== 204) {
+		try {
+			const contentType = response.headers.get("Content-Type");
+			if (contentType) {
+				const jsonTypes = ["application/json", "application/problem+json"];
+				const lc = contentType.toLowerCase();
+				const isJSON = jsonTypes.some((type) => lc.startsWith(type));
+				if (isJSON) {
+					return await response.json();
+				}
+				// Return Blob for PDF / binary responses
+				if (lc.startsWith('application/pdf') || lc.startsWith('application/octet-stream')) {
+					return await response.blob();
+				}
+				return await response.text();
+			}
+		} catch (error) {
+			console.error(error);
+		}
+	}
+	return undefined;
+};
+
+export const catchErrorCodes = (
+	options: ApiRequestOptions,
+	result: ApiResult
+): void => {
+	const errors: Record<number, string> = {
+		400: "Bad Request",
+		401: "Unauthorized",
+		403: "Forbidden",
+		404: "Not Found",
+		500: "Internal Server Error",
+		502: "Bad Gateway",
+		503: "Service Unavailable",
+		...options.errors,
+	};
+
+	const error = errors[result.status];
+	if (error) {
+		throw new ApiError(options, result, error);
+	}
+
+	if (!result.ok) {
+		const errorStatus = result.status ?? "unknown";
+		const errorStatusText = result.statusText ?? "unknown";
+		const errorBody = (() => {
+			try {
+				return JSON.stringify(result.body, null, 2);
+			} catch (e) {
+				return undefined;
+			}
+		})();
+
+		throw new ApiError(
+			options,
+			result,
+			`Generic Error: status: ${errorStatus}; status text: ${errorStatusText}; body: ${errorBody}`
+		);
+	}
+};
+
+// Cookies are cached per request "identity" rather than in one shared slot.
+// Shopper calls carry shopperguid/accountid in options.headers (resolved
+// per-call by resolveShopperHeaders()), so each shopper gets its own cookie
+// jar instead of one shopper's session leaking into another's requests when
+// a single SDK instance serves many shoppers concurrently (shopperScope:
+// 'per-request'). Portal/scanner calls carry no such header and fall back to
+// the single default slot, matching prior behavior.
+const DEFAULT_COOKIE_KEY = "__default__";
+const MAX_COOKIE_ENTRIES = 10_000;
+const cookiesByKey = new Map<string, string>();
+
+const getCookieKey = (options: ApiRequestOptions): string => {
+	const shopperguid = options.headers?.["shopperguid"];
+	const accountid = options.headers?.["accountid"];
+	if (isStringWithValue(shopperguid)) {
+		return `${shopperguid}:${isStringWithValue(accountid) ? accountid : ""}`;
+	}
+	return DEFAULT_COOKIE_KEY;
+};
+
+const storeCookie = (key: string, value: string): void => {
+	if (!cookiesByKey.has(key) && cookiesByKey.size >= MAX_COOKIE_ENTRIES) {
+		// Evict the oldest entry (Map preserves insertion order) to bound memory
+		// on a long-running, many-shopper backend process.
+		const oldestKey = cookiesByKey.keys().next().value;
+		if (oldestKey !== undefined) {
+			cookiesByKey.delete(oldestKey);
+		}
+	}
+	cookiesByKey.set(key, value);
+};
+
+/**
+ * Wraps sendRequest to capture cookies on login
+ * and attach cookies on other requests
+ */
+export const request = <T>(
+	config: OpenAPIConfig,
+	options: ApiRequestOptions
+): CancelablePromise<T> => {
+	return new CancelablePromise(async (resolve, reject, onCancel) => {
+		try {
+			assertInitialized(config.BASE);
+			const url = getUrl(config, options);
+			const formData = getFormData(options);
+			const body = getRequestBody(options);
+			const cookieKey = getCookieKey(options);
+
+			// Before making headers, possibly attach cookie if we have it
+			const baseHeaders = await getHeaders(config, options);
+			// We will build combined headers
+			const headerObj: Record<string, string> = {};
+			baseHeaders.forEach((value, key) => {
+				headerObj[key] = value;
+			});
+			const storedCookie = cookiesByKey.get(cookieKey);
+			if (storedCookie) {
+				// Attach stored cookie
+				headerObj["Cookie"] = storedCookie;
+			}
+			const headers = new Headers(headerObj);
+
+			if (!onCancel.isCancelled) {
+				const response = await sendRequest(
+					config,
+					options,
+					url,
+					body,
+					formData,
+					headers,
+					onCancel
+				);
+
+				// Capture Set-Cookie if present
+				const setCookie = response.headers.get("set-cookie");
+				if (setCookie) {
+					// Overwrite or append as needed
+					storeCookie(cookieKey, setCookie);
+				}
+
+				const responseBody = await getResponseBody(response);
+				const responseHeader = getResponseHeader(
+					response,
+					options.responseHeader
+				);
+
+				const result: ApiResult = {
+					url,
+					ok: response.ok,
+					status: response.status,
+					statusText: response.statusText,
+					body: responseHeader ?? responseBody,
+				};
+
+				catchErrorCodes(options, result);
+
+				resolve(result.body as T);
+			}
+		} catch (error) {
+			reject(error);
+		}
+	});
+};