@antelopejs/dms-ai 0.4.1 → 0.6.0

package/frontend-vue/app/chat/utils/tool-lexicon.ts

@@ -304,6 +304,30 @@ const ASSISTANT_TOOLS: Record<string, ToolLexiconEntry> = {
 		target: firstOf("query", "search", "level"),
 		isReadOnly: true,
 	},
+	DatabaseConnections: {
+		verb: "list_databases",
+		icon: ICONS.DATA,
+		target: none,
+		isReadOnly: true,
+	},
+	DatabaseRelations: {
+		verb: "list_relations",
+		icon: ICONS.DATA,
+		target: firstOf("connection"),
+		isReadOnly: true,
+	},
+	DatabaseDescribe: {
+		verb: "describe_relations",
+		icon: ICONS.TABLE,
+		target: countOf("relations"),
+		isReadOnly: true,
+	},
+	DatabaseProfile: {
+		verb: "profile_relation",
+		icon: ICONS.TABLE,
+		target: firstOf("relation", "connection"),
+		isReadOnly: true,
+	},
 };
 
 const BUILDER_TOOLS: Record<string, ToolLexiconEntry> = {
@@ -393,6 +417,28 @@ const BUILDER_TOOLS: Record<string, ToolLexiconEntry> = {
 		target: firstOf("ref"),
 		isReadOnly: true,
 	},
+	BuilderConfigureProject: {
+		verb: "configure_project",
+		icon: ICONS.DATA,
+		target: countOf("steps"),
+	},
+	BuilderMapResources: {
+		verb: "map_tables",
+		icon: ICONS.TABLE,
+		target: firstOf("connection", "module"),
+	},
+	BuilderMapping: {
+		verb: "read_mapping",
+		icon: ICONS.TABLE,
+		target: firstOf("connection", "module"),
+		isReadOnly: true,
+	},
+	BuilderAnalyseDatabase: {
+		verb: "analyse_database",
+		icon: ICONS.TABLE,
+		target: firstOf("connection", "job"),
+		isReadOnly: true,
+	},
 	BuilderCreateResource: {
 		verb: "create_table",
 		icon: ICONS.TABLE,

package/frontend-vue/app/components/ActivityDetail.vue

@@ -9,11 +9,8 @@ import { useAiData } from "../views/composables/useAiData";
 import { useAssistant } from "../views/composables/useAssistant";
 import { useViewFormat } from "../views/composables/useViewFormat";
 import { AI_PAGES, AI_ROUTES, CHANGE_SET_QUERY_KEY } from "../views/constants";
-import type {
-	ActivityDetailPayload,
-	ActivityRow,
-	RowNavigation,
-} from "../views/types";
+import type { RowNavigation } from "#dms-ui/app/types/row-navigation";
+import type { ActivityDetailPayload, ActivityRow } from "../views/types";
 import {
 	activityOutput,
 	argumentItems,

package/frontend-vue/app/components/ChatPanel.vue

@@ -173,9 +173,11 @@ onMounted(() => {
 	color: var(--ui-text-muted);
 }
 
+/* Sits where the panel header's close button does: centred in a header
+   as tall as the DMS navbar (28px is the small square button height). */
 .dms-ai-panel-close {
 	position: absolute;
-	top: 11px;
+	top: calc((var(--ui-header-height) - 28px) / 2);
 	right: 8px;
 }
 

package/frontend-vue/app/components/SkillDetail.vue

@@ -1,15 +1,25 @@
 <script setup lang="ts">
+import type { Tone } from "#dms-ui/app/types/tone";
 import { computed } from "vue";
-import { renderMarkdown } from "../chat/utils/markdown";
-import RowStepper from "../views/RowStepper.vue";
+import { renderDocument } from "../chat/utils/markdown";
 import { useAssistant } from "../views/composables/useAssistant";
 import { useViewFormat } from "../views/composables/useViewFormat";
-import type { RowNavigation, SkillRow } from "../views/types";
+import type { SkillRow } from "../views/types";
 import { skillLook } from "../views/utils/skills";
 
 interface Props {
 	rowData?: SkillRow;
-	navigation?: RowNavigation;
+}
+
+/** A fact of the skill: a status pill, an identifier (mono) or plain text. */
+interface SkillFact {
+	id: string;
+	label: string;
+	value: string;
+	type?: "status" | "mono";
+	tone?: Tone;
+	/** Draws a button copying the value. */
+	copy?: boolean;
 }
 
 const props = defineProps<Props>();
@@ -20,9 +30,9 @@ const assistant = useAssistant();
 
 const skill = computed(() => props.rowData);
 const look = computed(() => (skill.value ? skillLook(skill.value) : null));
-const html = computed(() => renderMarkdown(skill.value?.body ?? ""));
+const html = computed(() => renderDocument(skill.value?.body ?? ""));
 
-const facts = computed(() => {
+const facts = computed<SkillFact[]>(() => {
 	const current = skill.value;
 	if (!current || !look.value) return [];
 	return [
@@ -30,14 +40,21 @@ const facts = computed(() => {
 			id: "source",
 			label: t("dms_ai.views.skills.source_label"),
 			value: t(`dms_ai.views.skills.source.${current.source}`),
-			type: "status" as const,
+			type: "status",
 			tone: look.value.badgeTone,
 		},
+		{
+			id: "qualified",
+			label: t("dms_ai.views.skills.qualified_name_label"),
+			value: current.qualifiedName,
+			type: "mono",
+			copy: true,
+		},
 		{
 			id: "origin",
 			label: t("dms_ai.views.skills.origin_label"),
 			value: current.origin,
-			type: "mono" as const,
+			type: "mono",
 			copy: true,
 		},
 		{
@@ -67,22 +84,6 @@ function openLastConversation(): void {
 
 <template>
 	<div v-if="skill && look" class="flex min-h-full flex-col gap-5">
-		<RowStepper v-if="props.navigation" :navigation="props.navigation" />
-
-		<header class="flex items-start gap-3">
-			<DmsIconWell :icon="look.icon" :tone="look.tone" size="lg" />
-			<div class="min-w-0 flex-1">
-				<h3
-					class="text-highlighted truncate font-mono text-[15px] font-semibold"
-				>
-					{{ skill.name }}
-				</h3>
-				<p class="text-dimmed mt-0.5 truncate font-mono text-[11.5px]">
-					{{ skill.qualifiedName }}
-				</p>
-			</div>
-		</header>
-
 		<DmsBanner
 			v-if="skill.isShadowed"
 			size="sm"
@@ -95,9 +96,38 @@ function openLastConversation(): void {
 			"
 		/>
 
-		<DmsKeyValueList :items="facts" />
+		<!-- The drawer's header names the skill. The facts read as a record
+		     drawer's fields: the DMS form row, a label column beside a
+		     left-aligned value once the drawer is wide enough, the label above
+		     it on a phone. -->
+		<div class="grid gap-3">
+			<DmsFieldRow
+				v-for="fact in facts"
+				:key="fact.id"
+				:label="fact.label"
+				layout="form"
+				spacing="list"
+				:inset="false"
+			>
+				<div class="flex min-w-0 items-center gap-1.5 text-[13px]">
+					<DmsStatusPill
+						v-if="fact.type === 'status'"
+						:tone="fact.tone ?? 'neutral'"
+						:label="fact.value"
+					/>
+					<span
+						v-else
+						class="text-highlighted wrap-anywhere min-w-0"
+						:class="fact.type === 'mono' && 'font-mono text-[12.5px]'"
+					>
+						{{ fact.value }}
+					</span>
+					<DmsCopyButton v-if="fact.copy" :value="fact.value" class="-my-1" />
+				</div>
+			</DmsFieldRow>
+		</div>
 
-		<p class="text-muted text-[13px] leading-relaxed">
+		<p class="text-muted max-w-[76ch] text-[13px] leading-relaxed">
 			{{ skill.description }}
 		</p>
 
@@ -185,4 +215,20 @@ function openLastConversation(): void {
 	color: var(--ui-primary);
 	text-decoration: underline;
 }
+/* Running text keeps a readable measure in the wide sheet; code and tables
+   may use the whole width. */
+.dms-ai-skill-doc :deep(:is(p, ul, ol, blockquote, h1, h2, h3, h4, h5, h6)) {
+	max-width: 76ch;
+}
+.dms-ai-skill-doc :deep(table) {
+	margin: 0 0 8px;
+	border-collapse: collapse;
+	display: block;
+	overflow-x: auto;
+}
+.dms-ai-skill-doc :deep(:is(th, td)) {
+	padding: 4px 8px;
+	border: 1px solid var(--ui-border);
+	text-align: start;
+}
 </style>

package/frontend-vue/app/views/RowStepper.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { RowNavigation } from "./types";
+import type { RowNavigation } from "#dms-ui/app/types/row-navigation";
 
 interface Props {
 	navigation: RowNavigation;

package/frontend-vue/app/views/types.ts

@@ -170,16 +170,6 @@ export interface SkillRow {
 	icon?: string;
 }
 
-/** What a DMS row drawer hands its component to step through the rows. */
-export interface RowNavigation {
-	index: number;
-	total: number;
-	hasPrev: boolean;
-	hasNext: boolean;
-	prev: () => void;
-	next: () => void;
-}
-
 /** One fact of a change set, a row of a DmsKeyValueList. */
 export interface Fact {
 	id: string;

package/frontend-vue/i18n/locales/dms-ai-pages-en-GB.json

@@ -28,6 +28,10 @@
 		},
 		"blocks": {
 			"overview": {
+				"toolbar": {
+					"name": "Toolbar",
+					"description": "When the Overview last read its figures, a refresh, and the period"
+				},
 				"period": {
 					"name": "Period",
 					"description": "Picks the period the Overview's figures cover"
@@ -80,11 +84,11 @@
 				},
 				"activity_chart": {
 					"name": "Activity chart",
-					"description": "Actions per day, compared with the previous period",
+					"description": "Actions per day, against the chosen comparison",
 					"title": "Activity",
 					"caption": "Actions over the selected period",
 					"primary": "Actions",
-					"comparison": "Previous period"
+					"comparison": "Comparison"
 				},
 				"allowed": {
 					"name": "How actions were allowed",
@@ -133,6 +137,14 @@
 				}
 			},
 			"activity": {
+				"toolbar": {
+					"name": "Toolbar",
+					"description": "When the audit log was last read, a refresh, and the period"
+				},
+				"period": {
+					"name": "Period",
+					"description": "Picks the period the audit log covers"
+				},
 				"log": {
 					"name": "Audit log",
 					"description": "Every tool call, how it was allowed and what came out"
@@ -161,6 +173,10 @@
 				}
 			},
 			"settings": {
+				"chatgpt": {
+					"name": "ChatGPT account",
+					"description": "The ChatGPT account Codex runs on, with sign-in and sign-out"
+				},
 				"form": {
 					"name": "Assistant settings",
 					"description": "Agent, approvals, scope, skills and history defaults"
@@ -408,7 +424,32 @@
 				},
 				"codex": {
 					"label": "Codex",
-					"description": "OpenAI · needs the Codex CLI and an OpenAI API key"
+					"description": "OpenAI · runs on your ChatGPT plan, once signed in below"
+				}
+			},
+			"chatgpt": {
+				"signed_out": {
+					"title": "Run Codex on your ChatGPT plan",
+					"description": "Sign in with ChatGPT to use your plan's Codex usage here, with no API key. If the DMS runs on another machine, the page OpenAI sends you back to won't load: paste its address with “Paste the return address”.",
+					"action": "Sign in with ChatGPT"
+				},
+				"signed_in": {
+					"title": "Codex runs on the ChatGPT plan of {email}",
+					"description": "Its usage counts toward your plan's limits, which you can cap per app in ChatGPT's settings.",
+					"action": "Sign out"
+				},
+				"sign_out_confirm": {
+					"title": "Sign out of ChatGPT?",
+					"description": "Codex stops working on every DMS project of this machine until you sign in again. To remove dms-ai from your ChatGPT account entirely, disconnect it in ChatGPT's settings."
+				},
+				"signed_out_toast": "Signed out of ChatGPT",
+				"paste": {
+					"action": "Paste the return address",
+					"title": "Finish signing in with ChatGPT",
+					"description": "After you allowed access, OpenAI sent you to an address starting with http://127.0.0.1 that could not load. Copy that whole address from the address bar and paste it here. It works once, within 10 minutes.",
+					"field": "Return address",
+					"confirm": "Finish signing in",
+					"success": "Signed in with ChatGPT"
 				}
 			},
 			"thinking": {
@@ -532,7 +573,8 @@
 			},
 			"detail": {
 				"open": "Details",
-				"title": "Skill detail"
+				"title": "Skill detail",
+				"position": "Skill {index} of {total}"
 			},
 			"empty": {
 				"title": "No skills loaded",

package/frontend-vue/i18n/locales/dms-ai-pages-fr-FR.json

@@ -28,6 +28,10 @@
 		},
 		"blocks": {
 			"overview": {
+				"toolbar": {
+					"name": "Barre d'outils",
+					"description": "Quand la vue d'ensemble a lu ses chiffres, un rafraîchissement et la période"
+				},
 				"period": {
 					"name": "Période",
 					"description": "Choisit la période couverte par les chiffres de la vue d'ensemble"
@@ -80,11 +84,11 @@
 				},
 				"activity_chart": {
 					"name": "Graphique d'activité",
-					"description": "Actions par jour, comparées à la période précédente",
+					"description": "Actions par jour, face à la comparaison choisie",
 					"title": "Activité",
 					"caption": "Actions sur la période choisie",
 					"primary": "Actions",
-					"comparison": "Période précédente"
+					"comparison": "Comparaison"
 				},
 				"allowed": {
 					"name": "Comment les actions ont été autorisées",
@@ -133,6 +137,14 @@
 				}
 			},
 			"activity": {
+				"toolbar": {
+					"name": "Barre d'outils",
+					"description": "Quand le journal d'audit a été lu, un rafraîchissement et la période"
+				},
+				"period": {
+					"name": "Période",
+					"description": "Choisit la période couverte par le journal d'audit"
+				},
 				"log": {
 					"name": "Journal d'audit",
 					"description": "Chaque appel d'outil, comment il a été autorisé et son résultat"
@@ -161,6 +173,10 @@
 				}
 			},
 			"settings": {
+				"chatgpt": {
+					"name": "Compte ChatGPT",
+					"description": "Le compte ChatGPT sur lequel tourne Codex, avec connexion et déconnexion"
+				},
 				"form": {
 					"name": "Réglages de l'assistant",
 					"description": "Valeurs par défaut de l'agent, des validations, de la portée, des skills et de l'historique"
@@ -408,7 +424,32 @@
 				},
 				"codex": {
 					"label": "Codex",
-					"description": "OpenAI · nécessite la CLI Codex et une clé d'API OpenAI"
+					"description": "OpenAI · utilise votre forfait ChatGPT, une fois connecté ci-dessous"
+				}
+			},
+			"chatgpt": {
+				"signed_out": {
+					"title": "Utilisez Codex avec votre forfait ChatGPT",
+					"description": "Connectez-vous avec ChatGPT pour utiliser ici l'usage Codex de votre forfait, sans clé d'API. Si le DMS tourne sur une autre machine, la page où OpenAI vous renvoie ne chargera pas : collez son adresse avec « Coller l'adresse de retour ».",
+					"action": "Se connecter avec ChatGPT"
+				},
+				"signed_in": {
+					"title": "Codex utilise le forfait ChatGPT de {email}",
+					"description": "Son usage compte dans les limites de votre forfait, que vous pouvez plafonner par app dans les réglages de ChatGPT.",
+					"action": "Se déconnecter"
+				},
+				"sign_out_confirm": {
+					"title": "Se déconnecter de ChatGPT ?",
+					"description": "Codex ne fonctionnera plus sur aucun projet DMS de cette machine tant que vous ne vous reconnecterez pas. Pour retirer complètement dms-ai de votre compte ChatGPT, déconnectez-le dans les réglages de ChatGPT."
+				},
+				"signed_out_toast": "Déconnecté de ChatGPT",
+				"paste": {
+					"action": "Coller l'adresse de retour",
+					"title": "Terminer la connexion à ChatGPT",
+					"description": "Après votre autorisation, OpenAI vous a envoyé vers une adresse commençant par http://127.0.0.1 qui n'a pas pu charger. Copiez cette adresse complète depuis la barre d'adresse et collez-la ici. Elle ne sert qu'une fois, dans les 10 minutes.",
+					"field": "Adresse de retour",
+					"confirm": "Terminer la connexion",
+					"success": "Connecté avec ChatGPT"
 				}
 			},
 			"thinking": {
@@ -532,7 +573,8 @@
 			},
 			"detail": {
 				"open": "Détails",
-				"title": "Détail de la skill"
+				"title": "Détail de la skill",
+				"position": "Skill {index} sur {total}"
 			},
 			"empty": {
 				"title": "Aucune skill chargée",

package/frontend-vue/i18n/locales/dms-ai-panel-en-GB.json

@@ -416,6 +416,14 @@
 			"list_pages": "List pages",
 			"typecheck": "Typecheck",
 			"read_logs": "Read logs",
+			"list_databases": "List databases",
+			"list_relations": "List relations",
+			"describe_relations": "Describe relations",
+			"profile_relation": "Profile relation",
+			"configure_project": "Configure project",
+			"map_tables": "Map database tables",
+			"analyse_database": "Analyse the database",
+			"read_mapping": "Read the mapping",
 			"browse_blocks": "Browse blocks",
 			"read_page": "Read page",
 			"create_page": "Create page",

package/frontend-vue/i18n/locales/dms-ai-panel-fr-FR.json

@@ -416,6 +416,14 @@
 			"list_pages": "Lister les pages",
 			"typecheck": "Vérifier les types",
 			"read_logs": "Lire les journaux",
+			"list_databases": "Lister les bases de données",
+			"list_relations": "Lister les relations",
+			"describe_relations": "Décrire les relations",
+			"profile_relation": "Profiler la relation",
+			"configure_project": "Configurer le projet",
+			"map_tables": "Associer les tables de la base",
+			"analyse_database": "Analyser la base",
+			"read_mapping": "Lire l'association",
 			"browse_blocks": "Parcourir les blocs",
 			"read_page": "Lire la page",
 			"create_page": "Créer la page",

package/frontend-vue/i18n/locales/dms-ai-views-en-GB.json

@@ -131,6 +131,7 @@
 				"uses": "{count} use | {count} uses",
 				"never_used": "never used",
 				"source_label": "Source",
+				"qualified_name_label": "Full name",
 				"origin_label": "Origin",
 				"used_label": "Used",
 				"used_value": "{count}× · 30 days",

package/frontend-vue/i18n/locales/dms-ai-views-fr-FR.json

@@ -131,6 +131,7 @@
 				"uses": "{count} utilisation | {count} utilisations",
 				"never_used": "jamais utilisée",
 				"source_label": "Source",
+				"qualified_name_label": "Nom complet",
 				"origin_label": "Origine",
 				"used_label": "Utilisée",
 				"used_value": "{count}× · 30 jours",

package/frontend-vue/package.json

@@ -6,7 +6,7 @@
 	"license": "Apache-2.0",
 	"packageManager": "pnpm@10.6.5",
 	"engines": {
-		"@antelopejs/dms-frontend": ">=0.6.3 <0.7.0"
+		"@antelopejs/dms-frontend": ">=0.8.0 <0.9.0"
 	},
 	"scripts": {
 		"build": "pnpm --dir \"${DMS_FRONTEND_WORKSPACE:?Set DMS_FRONTEND_WORKSPACE to the generated Inertia workspace}\" build",

package/frontend-vue/tests/chat/markdown.test.ts

@@ -2,6 +2,7 @@
 import { describe, expect, it } from "vitest";
 import {
 	createIncrementalMarkdown,
+	renderDocument,
 	renderMarkdown,
 } from "../../app/chat/utils/markdown";
 
@@ -270,3 +271,71 @@ describe("a streaming answer renders incrementally", () => {
 		expect(renderedChars).toBeLessThan(paragraphs.length * 5);
 	});
 });
+
+describe("a document reflows its hard-wrapped lines", () => {
+	const SKILL = [
+		"# Skill",
+		"",
+		"The DMS is a **backend-driven admin framework** built",
+		"on AntelopeJS. You add an",
+		"admin screen by writing TypeScript.",
+		"",
+		"Second paragraph.",
+		"",
+		"- one item",
+		"  wrapped",
+		"- two",
+		"",
+		"```ts",
+		"const a = 1;",
+		"const b = 2;",
+		"```",
+		"",
+		"| a | b |",
+		"|---|---|",
+		"| 1 | 2 |",
+	].join("\n");
+
+	function renderSkill(): HTMLElement {
+		const host = document.createElement("div");
+		host.innerHTML = renderDocument(SKILL);
+		return host;
+	}
+
+	it("joins a paragraph's lines with spaces, not line breaks", () => {
+		const host = renderSkill();
+		expect(host.querySelector("br")).toBeNull();
+		// A soft break stays a newline in the text, which HTML shows as a space.
+		const text = host.querySelector("p")?.textContent?.replace(/\s+/g, " ");
+		expect(text).toBe(
+			"The DMS is a backend-driven admin framework built on AntelopeJS. You add an admin screen by writing TypeScript.",
+		);
+	});
+
+	it("keeps paragraphs, lists, code blocks and tables", () => {
+		const host = renderSkill();
+		expect(host.querySelectorAll("p")).toHaveLength(2);
+		expect(host.querySelectorAll("li")).toHaveLength(2);
+		expect(host.querySelector("li")?.textContent).toBe("one item\nwrapped");
+		expect(host.querySelector("pre code")?.textContent).toBe(
+			"const a = 1;\nconst b = 2;\n",
+		);
+		expect(host.querySelectorAll("td")).toHaveLength(2);
+	});
+
+	it("still honours a hard break written in the source", () => {
+		const host = document.createElement("div");
+		host.innerHTML = renderDocument("first  \nsecond");
+		expect(host.querySelector("br")).not.toBeNull();
+	});
+
+	it("leaves chat messages breaking on every newline", () => {
+		expect(renderMarkdown("one\ntwo")).toContain("<br>");
+	});
+
+	it("sanitizes like a chat message", () => {
+		expectHarmless(
+			renderDocument("<img src=x onerror=alert(1)>\n[x](javascript:alert(1))"),
+		);
+	});
+});

package/frontend-vue/tests/i18n-views.test.ts

@@ -0,0 +1,63 @@
+import { readdirSync, readFileSync, statSync } from "node:fs";
+import { join, resolve } from "node:path";
+import { describe, expect, it } from "vitest";
+import en from "../i18n/locales/dms-ai-views-en-GB.json";
+import fr from "../i18n/locales/dms-ai-views-fr-FR.json";
+
+type Tree = Record<string, unknown>;
+
+const ROOT = resolve(__dirname, "..");
+// The page components (the skill drawer and cards among them) and the view
+// helpers they share; the chat panel has its own test.
+const SOURCES = ["app/components", "app/views"];
+const EXCLUDED = ["ChatPanel.vue"];
+const LITERAL_KEY = /["'`](dms_ai\.views\.[A-Za-z0-9_.]+[A-Za-z0-9_])["'`]/g;
+
+/** Keys built at run time from a value, each with every value it can take. */
+const DYNAMIC_FAMILIES: Record<string, readonly string[]> = {
+	"dms_ai.views.skills.source": ["module", "local"],
+};
+
+function files(path: string): string[] {
+	const full = join(ROOT, path);
+	if (!statSync(full).isDirectory()) return [full];
+	return readdirSync(full)
+		.filter((entry) => !EXCLUDED.includes(entry))
+		.flatMap((entry) => files(join(path, entry)));
+}
+
+function flatten(tree: Tree, prefix = ""): string[] {
+	return Object.entries(tree).flatMap(([key, value]) =>
+		value !== null && typeof value === "object"
+			? flatten(value as Tree, `${prefix}${key}.`)
+			: [`${prefix}${key}`],
+	);
+}
+
+function usedKeys(): string[] {
+	const source = SOURCES.flatMap(files)
+		.map((file) => readFileSync(file, "utf8"))
+		.join("\n");
+	return [
+		...new Set([...source.matchAll(LITERAL_KEY)].map((match) => match[1])),
+	];
+}
+
+const dynamicKeys = Object.entries(DYNAMIC_FAMILIES).flatMap(
+	([prefix, values]) => values.map((value) => `${prefix}.${value}`),
+);
+
+describe("the views' strings", () => {
+	const english = new Set(flatten(en));
+	const french = new Set(flatten(fr));
+
+	it("exist in English and French alike", () => {
+		expect([...english].sort()).toEqual([...french].sort());
+	});
+
+	it("cover every key the views use", () => {
+		const keys = [...usedKeys(), ...dynamicKeys];
+		expect(keys.length).toBeGreaterThan(0);
+		expect(keys.filter((key) => !english.has(key))).toEqual([]);
+	});
+});