@remit/drizzle-service 0.0.104 → 0.0.105

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/drizzle-service",
-  "version": "0.0.104",
+  "version": "0.0.105",
   "description": "Drizzle ORM service over SQLite",
   "type": "module",
   "main": "src/index.ts",

package/src/bound-parameters.test.ts

@@ -0,0 +1,57 @@
+import assert from "node:assert/strict";
+import { describe, test } from "node:test";
+import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core";
+import { chunkRows, rowsPerStatement } from "./bound-parameters.js";
+
+const tenColumns = sqliteTable("ten_columns", {
+	c0: text("c0"),
+	c1: text("c1"),
+	c2: text("c2"),
+	c3: text("c3"),
+	c4: text("c4"),
+	c5: text("c5"),
+	c6: text("c6"),
+	c7: text("c7"),
+	c8: text("c8"),
+	c9: integer("c9"),
+});
+
+const rows = (count: number): number[] =>
+	Array.from({ length: count }, (_, index) => index);
+
+describe("chunkRows", () => {
+	test("no rows make no statements", () => {
+		assert.deepEqual(chunkRows(tenColumns, [], 100), []);
+	});
+
+	test("rows that fill the limit exactly make one statement", () => {
+		const chunks = chunkRows(tenColumns, rows(10), 100);
+		assert.deepEqual(
+			chunks.map((slice) => slice.length),
+			[10],
+		);
+	});
+
+	test("one row over the limit makes a second statement", () => {
+		const chunks = chunkRows(tenColumns, rows(11), 100);
+		assert.deepEqual(
+			chunks.map((slice) => slice.length),
+			[10, 1],
+		);
+		assert.deepEqual(chunks.flat(), rows(11));
+	});
+
+	test("reserved parameters shrink every statement", () => {
+		const chunks = chunkRows(tenColumns, rows(10), 100, 1);
+		assert.deepEqual(
+			chunks.map((slice) => slice.length),
+			[9, 1],
+		);
+	});
+});
+
+describe("rowsPerStatement", () => {
+	test("a row wider than the limit is refused", () => {
+		assert.throws(() => rowsPerStatement(100, 101), RangeError);
+	});
+});

package/src/bound-parameters.ts

@@ -0,0 +1,49 @@
+import { getTableColumns, type Table } from "drizzle-orm";
+
+export interface SqliteLimits {
+	/** The most parameters the host's SQLite binds in one statement: 32766 on better-sqlite3, 100 on D1 and Durable Object storage. */
+	maxBoundParameters: number;
+}
+
+export const BETTER_SQLITE3_LIMITS: SqliteLimits = {
+	maxBoundParameters: 32766,
+};
+
+export const chunk = <T>(items: readonly T[], size: number): T[][] => {
+	const chunks: T[][] = [];
+	for (let start = 0; start < items.length; start += size) {
+		chunks.push(items.slice(start, start + size));
+	}
+	return chunks;
+};
+
+export const rowsPerStatement = (
+	maxBoundParameters: number,
+	parametersPerRow: number,
+	reservedParameters = 0,
+): number => {
+	const rows = Math.floor(
+		(maxBoundParameters - reservedParameters) / parametersPerRow,
+	);
+	if (rows < 1) {
+		throw new RangeError(
+			`a row of ${parametersPerRow} bound parameters does not fit a statement limit of ${maxBoundParameters}`,
+		);
+	}
+	return rows;
+};
+
+export const chunkRows = <T>(
+	table: Table,
+	rows: readonly T[],
+	maxBoundParameters: number,
+	reservedParameters = 0,
+): T[][] =>
+	chunk(
+		rows,
+		rowsPerStatement(
+			maxBoundParameters,
+			Object.keys(getTableColumns(table)).length,
+			reservedParameters,
+		),
+	);

package/src/databases.ts

@@ -1,4 +1,5 @@
 import { syncBatch } from "./batch.js";
+import type { SqliteLimits } from "./bound-parameters.js";
 import type { Db, SqliteStore } from "./db.js";
 import { messageDataSchema } from "./schema/message-data.js";
 import { createSqliteDatabase } from "./sqlite-client.js";
@@ -22,16 +23,16 @@ export interface SqliteStores {
 
 export const syncStore = <TSchema extends Record<string, unknown>>(
 	db: Db<TSchema>,
-): SqliteStore<TSchema> => ({ db, batch: syncBatch(db) });
+	{ maxBoundParameters }: SqliteLimits,
+): SqliteStore<TSchema> => ({ db, batch: syncBatch(db), maxBoundParameters });
 
-export const syncStores = ({
-	app,
-	mail,
-	search,
-}: SqliteDatabases): SqliteStores => ({
-	app: syncStore(app),
-	mail: syncStore(mail),
-	search: syncStore(search),
+export const syncStores = (
+	{ app, mail, search }: SqliteDatabases,
+	limits: SqliteLimits,
+): SqliteStores => ({
+	app: syncStore(app, limits),
+	mail: syncStore(mail, limits),
+	search: syncStore(search, limits),
 });
 
 export interface SqliteDatabasePaths {

package/src/db.ts

@@ -26,4 +26,5 @@ export type RepositoryDb<TSchema extends Record<string, unknown>> = Omit<
 export interface SqliteStore<TSchema extends Record<string, unknown>> {
 	db: RepositoryDb<TSchema>;
 	batch: WriteBatch;
+	maxBoundParameters: number;
 }

package/src/index.ts

@@ -5,6 +5,10 @@ export {
 	syncBatch,
 	type WriteBatch,
 } from "./batch.js";
+export {
+	BETTER_SQLITE3_LIMITS,
+	type SqliteLimits,
+} from "./bound-parameters.js";
 export {
 	hasSqliteDatabaseEnv,
 	openSqliteDatabases,

package/src/repair/junk-only-address.sqlite.test.ts

@@ -4,6 +4,7 @@ import { composeFolderRoleAppointmentName } from "@remit/data-ports/folder-role"
 import { CanonicalMailboxRole } from "@remit/domain-enums";
 import Database from "better-sqlite3";
 import { drizzle } from "drizzle-orm/better-sqlite3";
+import { BETTER_SQLITE3_LIMITS } from "../bound-parameters.js";
 import { AccountSettingRepo } from "../repos/i4-account-setting.js";
 import type { MailboxSpecialUseRepo } from "../repos/i4-mailbox-special-use.js";
 import { createSqliteRepositories } from "../sqlite-repositories.js";
@@ -182,11 +183,14 @@ describe("addresses standing only on mail in Junk", () => {
 	before(() => {
 		sqlite = new Database(":memory:");
 		const db = drizzle(sqlite);
-		specialUse = createSqliteRepositories({
-			app: db,
-			mail: db,
-			search: db,
-		}).mailboxSpecialUse;
+		specialUse = createSqliteRepositories(
+			{
+				app: db,
+				mail: db,
+				search: db,
+			},
+			BETTER_SQLITE3_LIMITS,
+		).mailboxSpecialUse;
 		accountSetting = new AccountSettingRepo(db as never);
 		applyMigrationSet(sqlite, "app");
 		applyMigrationSet(sqlite, "mail");

package/src/repos/account.conformance.sqlite.test.ts

@@ -1,4 +1,5 @@
 import { accountRepositoryConformance } from "@remit/data-ports/conformance";
+import { BETTER_SQLITE3_LIMITS } from "../bound-parameters.js";
 import { NotFoundError } from "../error.js";
 import { randomId } from "../id.js";
 import { accountTable } from "../schema.js";
@@ -13,11 +14,14 @@ accountRepositoryConformance({
 			accounts: accountTable,
 		});
 		close = closeDb;
-		return createSqliteRepositories({
-			app: db,
-			mail: db,
-			search: db,
-		}).account;
+		return createSqliteRepositories(
+			{
+				app: db,
+				mail: db,
+				search: db,
+			},
+			BETTER_SQLITE3_LIMITS,
+		).account;
 	},
 	teardown: async () => {
 		await close?.();

package/src/repos/calendar-event-index.conformance.d1.test.ts

@@ -10,7 +10,7 @@ calendarEventIndexRepositoryConformance({
 	async createRepository() {
 		const opened = await openD1TestStores();
 		close = opened.close;
-		return new CalendarEventIndexRepo(opened.stores.app.db);
+		return new CalendarEventIndexRepo(opened.stores.app);
 	},
 	teardown: async () => {
 		await close?.();

package/src/repos/calendar-event-index.conformance.sqlite.test.ts

@@ -1,4 +1,6 @@
 import { calendarEventIndexRepositoryConformance } from "@remit/data-ports/conformance";
+import { BETTER_SQLITE3_LIMITS } from "../bound-parameters.js";
+import { syncStore } from "../databases.js";
 import { NotFoundError } from "../error.js";
 import { randomId } from "../id.js";
 import { calendarEventIndexTable } from "../schema.js";
@@ -13,7 +15,7 @@ calendarEventIndexRepositoryConformance({
 			calendarEventIndexes: calendarEventIndexTable,
 		});
 		close = closeDb;
-		return new CalendarEventIndexRepo(db as never);
+		return new CalendarEventIndexRepo(syncStore(db, BETTER_SQLITE3_LIMITS));
 	},
 	teardown: async () => {
 		await close?.();

package/src/repos/calendar-event-index.ts

@@ -4,7 +4,9 @@ import type {
 	ICalendarEventIndexRepository,
 } from "@remit/data-ports";
 import { and, asc, eq, gte, lt } from "drizzle-orm";
-import type { RepositoryDb } from "../db.js";
+import type { SqliteBatchItem, WriteBatch } from "../batch.js";
+import { chunkRows } from "../bound-parameters.js";
+import type { RepositoryDb, SqliteStore } from "../db.js";
 import { calendarEventIndexTable } from "../schema.js";
 
 type DB = RepositoryDb<Record<string, unknown>>;
@@ -28,39 +30,52 @@ function rowToOccurrence(
 }
 
 export class CalendarEventIndexRepo implements ICalendarEventIndexRepository {
-	constructor(private db: DB) {}
+	private readonly db: DB;
+	private readonly batch: WriteBatch;
+	private readonly maxBoundParameters: number;
+
+	constructor(store: SqliteStore<Record<string, unknown>>) {
+		this.db = store.db;
+		this.batch = store.batch;
+		this.maxBoundParameters = store.maxBoundParameters;
+	}
 
 	async replaceForObject(
 		calendarId: string,
 		calendarObjectId: string,
 		occurrences: CalendarOccurrenceInput[],
 	): Promise<void> {
-		await this.deleteForObject(calendarId, calendarObjectId);
-		if (occurrences.length === 0) return;
-
 		const now = Date.now();
-		await this.db.insert(calendarEventIndexTable).values(
-			occurrences.map((occurrence) => ({
-				calendarId,
-				calendarObjectId,
-				recurrenceId: occurrence.recurrenceId,
-				startAt: occurrence.startAt,
-				endAt: occurrence.endAt,
-				allDay: occurrence.allDay,
-				summary: occurrence.summary,
-				status: occurrence.status,
-				transparency: occurrence.transparency,
-				createdAt: now,
-				updatedAt: now,
-			})),
-		);
+		const rows = occurrences.map((occurrence) => ({
+			calendarId,
+			calendarObjectId,
+			recurrenceId: occurrence.recurrenceId,
+			startAt: occurrence.startAt,
+			endAt: occurrence.endAt,
+			allDay: occurrence.allDay,
+			summary: occurrence.summary,
+			status: occurrence.status,
+			transparency: occurrence.transparency,
+			createdAt: now,
+			updatedAt: now,
+		}));
+		const inserts: SqliteBatchItem[] = chunkRows(
+			calendarEventIndexTable,
+			rows,
+			this.maxBoundParameters,
+		).map((slice) => this.db.insert(calendarEventIndexTable).values(slice));
+		await this.batch([this.clear(calendarId, calendarObjectId), ...inserts]);
 	}
 
 	async deleteForObject(
 		calendarId: string,
 		calendarObjectId: string,
 	): Promise<void> {
-		await this.db
+		await this.clear(calendarId, calendarObjectId);
+	}
+
+	private clear(calendarId: string, calendarObjectId: string) {
+		return this.db
 			.delete(calendarEventIndexTable)
 			.where(
 				and(

package/src/repos/calendar-store.ts

@@ -8,6 +8,7 @@ import type {
 import { deriveCalendarObjectId } from "@remit/data-ports/id";
 import { and, eq, exists, sql } from "drizzle-orm";
 import type { SqliteBatchItem, WriteBatch } from "../batch.js";
+import { chunkRows } from "../bound-parameters.js";
 import type { RepositoryDb, SqliteStore } from "../db.js";
 import {
 	calendarEventIndexTable,
@@ -36,6 +37,7 @@ export class DrizzleCalendarStore implements ICalendarStore {
 
 	private readonly db: DB;
 	private readonly batch: WriteBatch;
+	private readonly maxBoundParameters: number;
 
 	constructor(
 		store: SqliteStore<Record<string, unknown>>,
@@ -43,10 +45,11 @@ export class DrizzleCalendarStore implements ICalendarStore {
 	) {
 		this.db = store.db;
 		this.batch = store.batch;
+		this.maxBoundParameters = store.maxBoundParameters;
 		this.repos = {
 			calendarCollection: new CalendarCollectionRepo(store.db),
 			calendarObject: new CalendarObjectRepo(store.db),
-			calendarEventIndex: new CalendarEventIndexRepo(store.db),
+			calendarEventIndex: new CalendarEventIndexRepo(store),
 			calendarSuggestion,
 			calendarFeedToken: new CalendarFeedTokenRepo(store.db),
 		};
@@ -138,17 +141,21 @@ export class DrizzleCalendarStore implements ICalendarStore {
 						}),
 					this.clearOccurrences(calendarId, calendarObjectId),
 				];
-				if (write.occurrences.length === 0) return items;
+				const occurrences = write.occurrences.map((occurrence) => ({
+					...occurrence,
+					calendarId,
+					calendarObjectId,
+					createdAt: now,
+					updatedAt: now,
+				}));
 				return [
 					...items,
-					this.db.insert(calendarEventIndexTable).values(
-						write.occurrences.map((occurrence) => ({
-							...occurrence,
-							calendarId,
-							calendarObjectId,
-							createdAt: now,
-							updatedAt: now,
-						})),
+					...chunkRows(
+						calendarEventIndexTable,
+						occurrences,
+						this.maxBoundParameters,
+					).map((slice) =>
+						this.db.insert(calendarEventIndexTable).values(slice),
 					),
 				];
 			}

package/src/repos/cascade-delete.test.ts

@@ -2,6 +2,7 @@ import assert from "node:assert";
 import { after, before, describe, test } from "node:test";
 import { MailboxCursorState } from "@remit/domain-enums";
 import { eq } from "drizzle-orm";
+import { BETTER_SQLITE3_LIMITS } from "../bound-parameters.js";
 import { syncStores } from "../databases.js";
 import {
 	accountSettingTable,
@@ -300,7 +301,10 @@ describe("runDrizzleCascadeDelete", () => {
 
 	test("deletes every enumerated row across all tables", async () => {
 		await runDrizzleCascadeDelete(
-			syncStores({ app: db, mail: db, search: db } as never),
+			syncStores(
+				{ app: db, mail: db, search: db } as never,
+				BETTER_SQLITE3_LIMITS,
+			),
 			entities,
 			log,
 		);
@@ -439,7 +443,10 @@ describe("runDrizzleCascadeDelete", () => {
 		await assert.rejects(
 			() =>
 				runDrizzleCascadeDelete(
-					syncStores({ app: db, mail: db, search: db } as never),
+					syncStores(
+						{ app: db, mail: db, search: db } as never,
+						BETTER_SQLITE3_LIMITS,
+					),
 					[{ entityType: "Nonsense", key: { id: "x" } }],
 					log,
 				),

package/src/repos/cascade-delete.ts

@@ -1,4 +1,5 @@
 import type { SqliteBatchItem } from "../batch.js";
+import { BETTER_SQLITE3_LIMITS } from "../bound-parameters.js";
 import {
 	openSqliteDatabases,
 	type SqliteDatabasePaths,
@@ -241,6 +242,6 @@ export const createSqliteCascadeDeleter = async (
 	paths: SqliteDatabasePaths,
 ): Promise<CascadeDeleter> => {
 	const databases = await openSqliteDatabases(paths);
-	const stores = syncStores(databases);
+	const stores = syncStores(databases, BETTER_SQLITE3_LIMITS);
 	return (entities, log) => runDrizzleCascadeDelete(stores, entities, log);
 };

package/src/repos/envelope.d1.test.ts

@@ -0,0 +1,66 @@
+import assert from "node:assert/strict";
+import { after, before, describe, test } from "node:test";
+import type { BodyPartUpsertInput } from "@remit/data-ports";
+import { ReferenceType } from "@remit/domain-enums";
+import { openD1TestStore } from "../test-d1.js";
+import { DrizzleEnvelopeRepository } from "./envelope.js";
+
+const MESSAGE_ID = "00000000-0000-0000-4444-000000000d01";
+
+const bodyPart = (index: number): BodyPartUpsertInput => ({
+	partPath: `${index + 1}`,
+	parentPartPath: null,
+	mediaType: "TEXT",
+	mediaSubtype: "plain",
+	transferEncoding: "7BIT",
+	sizeOctets: 128,
+	isMultipart: false,
+	parameters: [{ parameterName: "charset", parameterValue: "utf-8" }],
+});
+
+describe("DrizzleEnvelopeRepository on D1's 100 bound parameter limit", () => {
+	let repo: DrizzleEnvelopeRepository;
+	let close: () => Promise<void>;
+
+	before(async () => {
+		const opened = await openD1TestStore("mail");
+		close = opened.close;
+		repo = new DrizzleEnvelopeRepository(opened.store);
+		await repo.upsertEnvelope({
+			envelopeId: "ignored-derived",
+			messageId: MESSAGE_ID,
+			dateValue: 1700000000000,
+			dateRaw: "Mon, 14 Nov 2023 08:00:00 +0000",
+			subject: "Thirty parts",
+		});
+	});
+
+	after(async () => {
+		await close();
+	});
+
+	test("upsertBodyParts writes thirty parts and their parameters", async () => {
+		await repo.upsertBodyParts(
+			MESSAGE_ID,
+			Array.from({ length: 30 }, (_, index) => bodyPart(index)),
+		);
+
+		const data = await repo.getMessageData(MESSAGE_ID);
+		assert.equal(data.bodyPart.length, 30);
+		assert.equal(data.bodyPartParameter.length, 30);
+	});
+
+	test("replaceMessageReferences writes thirty references", async () => {
+		await repo.replaceMessageReferences(
+			MESSAGE_ID,
+			Array.from({ length: 30 }, (_, index) => ({
+				messageIdValue: `<ref-${index}@example.com>`,
+				referenceType: ReferenceType.References,
+				referenceOrder: index,
+			})),
+		);
+
+		const data = await repo.getMessageData(MESSAGE_ID);
+		assert.equal(data.messageReference.length, 30);
+	});
+});

package/src/repos/envelope.sqlite.test.ts

@@ -1,5 +1,6 @@
 import assert from "node:assert/strict";
 import { after, before, describe, test } from "node:test";
+import { BETTER_SQLITE3_LIMITS } from "../bound-parameters.js";
 import {
 	type MessageDataSchema,
 	messageDataSchema,
@@ -20,7 +21,10 @@ describe("DrizzleEnvelopeRepository (sqlite)", () => {
 
 	before(async () => {
 		({ db, close } = await createSqliteTestDb(messageDataSchema));
-		repo = createSqliteRepositories({ app: db, mail: db, search: db }).envelope;
+		repo = createSqliteRepositories(
+			{ app: db, mail: db, search: db },
+			BETTER_SQLITE3_LIMITS,
+		).envelope;
 	});
 
 	after(async () => {

package/src/repos/envelope.test.ts

@@ -1,6 +1,7 @@
 import assert from "node:assert/strict";
 import { after, before, describe, test } from "node:test";
 import type { BodyPartUpsertInput } from "@remit/data-ports";
+import { BETTER_SQLITE3_LIMITS } from "../bound-parameters.js";
 import { envelopeId as deriveEnvelopeId } from "../id.js";
 import { createSqliteRepositories } from "../sqlite-repositories.js";
 import type { DrizzleEnvelopeRepository } from "./envelope.js";
@@ -19,7 +20,10 @@ describe("DrizzleEnvelopeRepository", () => {
 
 	before(async () => {
 		({ db, stop } = await createTestDb());
-		repo = createSqliteRepositories({ app: db, mail: db, search: db }).envelope;
+		repo = createSqliteRepositories(
+			{ app: db, mail: db, search: db },
+			BETTER_SQLITE3_LIMITS,
+		).envelope;
 
 		await repo.upsertEnvelope({
 			envelopeId: ENVELOPE_ID,

package/src/repos/envelope.ts

@@ -9,7 +9,8 @@ import type {
 	UpdateEnvelopeInput,
 } from "@remit/data-ports";
 import { eq } from "drizzle-orm";
-import type { WriteBatch } from "../batch.js";
+import type { SqliteBatchItem, WriteBatch } from "../batch.js";
+import { chunkRows } from "../bound-parameters.js";
 import type { RepositoryDb, SqliteStore } from "../db.js";
 import {
 	CreateFailedConflictError,
@@ -57,10 +58,12 @@ function dedupeById<T>(rows: T[], getId: (row: T) => string): T[] {
 export class DrizzleEnvelopeRepository implements IEnvelopeRepository {
 	private readonly db: DB;
 	private readonly batch: WriteBatch;
+	private readonly maxBoundParameters: number;
 
 	constructor(store: SqliteStore<Record<string, unknown>>) {
 		this.db = store.db;
 		this.batch = store.batch;
+		this.maxBoundParameters = store.maxBoundParameters;
 	}
 
 	async getMessageData(messageId: string): Promise<MessageData> {
@@ -180,22 +183,30 @@ export class DrizzleEnvelopeRepository implements IEnvelopeRepository {
 			(r) => r.bodyPartParameterId,
 		);
 
-		const insertParts = this.db
-			.insert(bodyPartTable)
-			.values(dedupedBodyPartRows)
-			.onConflictDoUpdate({
-				target: bodyPartTable.bodyPartId,
-				set: { updatedAt: now },
-			});
-		if (dedupedParameterRows.length === 0) {
-			await this.batch([insertParts]);
-			return;
-		}
-		await this.batch([
-			insertParts,
+		const upsertUpdatedAt = 1;
+		const insertParts: SqliteBatchItem[] = chunkRows(
+			bodyPartTable,
+			dedupedBodyPartRows,
+			this.maxBoundParameters,
+			upsertUpdatedAt,
+		).map((slice) =>
+			this.db
+				.insert(bodyPartTable)
+				.values(slice)
+				.onConflictDoUpdate({
+					target: bodyPartTable.bodyPartId,
+					set: { updatedAt: now },
+				}),
+		);
+		const insertParameters: SqliteBatchItem[] = chunkRows(
+			bodyPartParameterTable,
+			dedupedParameterRows,
+			this.maxBoundParameters,
+			upsertUpdatedAt,
+		).map((slice) =>
 			this.db
 				.insert(bodyPartParameterTable)
-				.values(dedupedParameterRows)
+				.values(slice)
 				.onConflictDoUpdate({
 					target: bodyPartParameterTable.bodyPartParameterId,
 					set: {
@@ -203,7 +214,8 @@ export class DrizzleEnvelopeRepository implements IEnvelopeRepository {
 						updatedAt: now,
 					},
 				}),
-		]);
+		);
+		await this.batch([...insertParts, ...insertParameters]);
 	}
 
 	async replaceMessageReferences(
@@ -215,23 +227,20 @@ export class DrizzleEnvelopeRepository implements IEnvelopeRepository {
 		const clear = this.db
 			.delete(messageReferenceTable)
 			.where(eq(messageReferenceTable.messageId, messageId));
-		if (references.length === 0) {
-			await this.batch([clear]);
-			return;
-		}
+		const rows = references.map((reference) => ({
+			...reference,
+			messageReferenceId: deterministicBase36Id(
+				`msgref:${messageId}:${reference.referenceType}:${reference.referenceOrder}`,
+			),
+			messageId,
+			envelopeId,
+			createdAt: now,
+			updatedAt: now,
+		}));
 		await this.batch([
 			clear,
-			this.db.insert(messageReferenceTable).values(
-				references.map((reference) => ({
-					...reference,
-					messageReferenceId: deterministicBase36Id(
-						`msgref:${messageId}:${reference.referenceType}:${reference.referenceOrder}`,
-					),
-					messageId,
-					envelopeId,
-					createdAt: now,
-					updatedAt: now,
-				})),
+			...chunkRows(messageReferenceTable, rows, this.maxBoundParameters).map(
+				(slice) => this.db.insert(messageReferenceTable).values(slice),
 			),
 		]);
 	}