tessera-learn 0.0.10 → 0.0.13

package/src/plugin/index.ts

@@ -1,16 +1,40 @@
 import type { Plugin, ResolvedConfig, ViteDevServer } from 'vite';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
 import { fileURLToPath } from 'node:url';
-import { dirname, resolve } from 'node:path';
-import { existsSync, readFileSync, readdirSync, statSync, writeFileSync, unlinkSync, cpSync, mkdirSync } from 'node:fs';
-import { generateManifest, extractDefaultExportObjectLiteral } from './manifest.js';
-import JSON5 from 'json5';
+import { dirname, resolve, relative, isAbsolute } from 'node:path';
+import {
+  existsSync,
+  readdirSync,
+  statSync,
+  writeFileSync,
+  unlinkSync,
+  cpSync,
+  mkdirSync,
+} from 'node:fs';
+import { generateManifest, readCourseConfig } from './manifest.js';
 import type { Manifest } from './manifest.js';
-import { validateProject } from './validation.js';
+import type { CourseConfig } from '../runtime/types.js';
+import {
+  validateProject,
+  reportValidationIssues,
+  normalizeA11y,
+  isPlausibleLanguageTag,
+  isIgnored,
+  type A11ySettings,
+} from './validation.js';
 import { runExport } from './export.js';
 import { tesseraLayoutPlugin } from './layout.js';
 import { tesseraQuizPlugin } from './quiz.js';
 
+import { AUDIT_ENV_FLAG } from './a11y/audit.js';
+
+export { runAudit } from './a11y/audit.js';
+export type { AuditOptions, ImpactLevel } from './a11y/audit.js';
+
+function isAuditBuild(): boolean {
+  return process.env[AUDIT_ENV_FLAG] === '1';
+}
+
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
@@ -26,12 +50,71 @@ function resolveStylesDir(): string {
   return resolve(packageRoot, 'styles');
 }
 
+// Tier-1a state shared between the svelte() onwarn handler and the sibling
+// gate plugin. onwarn fires during transform (after the Tier-1b buildStart
+// gate), so a11y warnings are collected here and flushed/gated at buildEnd.
+interface A11yCompilerState {
+  warnings: string[];
+  projectRoot: string;
+  isBuild: boolean;
+  settings: A11ySettings;
+}
+
+// Svelte's onwarn filename is relative to the vite root (e.g. `pages/x.svelte`)
+// in build and may be absolute or a virtual id elsewhere. Return the
+// project-relative path for a real author file, or null to skip framework /
+// node_modules / virtual modules — Tier 0 owns the framework's own warnings.
+function projectFileRel(
+  filename: string | undefined,
+  projectRoot: string,
+): string | null {
+  if (!filename || !projectRoot) return null;
+  if (
+    filename.startsWith('\0') ||
+    filename.includes('virtual:') ||
+    filename.includes('node_modules')
+  ) {
+    return null;
+  }
+  const abs = isAbsolute(filename) ? filename : resolve(projectRoot, filename);
+  const rel = relative(projectRoot, abs);
+  if (rel.startsWith('..') || isAbsolute(rel) || rel.includes('node_modules')) {
+    return null;
+  }
+  return rel;
+}
+
 export function tesseraPlugin() {
-  const manifestRef: { current: Manifest | null; root: string } = { current: null, root: '' };
+  const manifestRef: { current: Manifest | null; root: string } = {
+    current: null,
+    root: '',
+  };
+  const a11y: A11yCompilerState = {
+    warnings: [],
+    projectRoot: '',
+    isBuild: false,
+    settings: normalizeA11y(undefined),
+  };
   return [
     svelte({
       compilerOptions: { css: 'external' },
+      onwarn(warning, defaultHandler) {
+        if (warning.code?.startsWith('a11y')) {
+          const rel = projectFileRel(warning.filename, a11y.projectRoot);
+          if (rel !== null) {
+            const msg = `[${warning.code}] ${rel}: ${warning.message}`;
+            if (a11y.isBuild) {
+              a11y.warnings.push(msg);
+            } else if (!a11y.settings.ignore.includes(warning.code)) {
+              reportValidationIssues({ errors: [], warnings: [msg] });
+            }
+          }
+          return; // suppress the raw Vite print; we re-emit via the reporter
+        }
+        defaultHandler?.(warning);
+      },
     }),
+    tesseraA11yCompilerPlugin(a11y),
     tesseraValidationPlugin(),
     tesseraEntryPlugin(),
     tesseraConfigPlugin(),
@@ -58,6 +141,7 @@ function tesseraEntryPlugin(): Plugin {
   const stylesDir = resolveStylesDir();
   const appSveltePath = resolve(runtimeDir, 'App.svelte');
   let projectRoot: string;
+  let outDir: string;
   let isBuild = false;
 
   return {
@@ -66,13 +150,18 @@ function tesseraEntryPlugin(): Plugin {
 
     configResolved(config: ResolvedConfig) {
       projectRoot = config.root;
+      outDir = resolve(config.root, config.build.outDir);
       isBuild = config.command === 'build';
     },
 
     // For build mode: write index.html so Rollup can find it
     buildStart() {
       if (isBuild) {
-        writeFileSync(resolve(projectRoot, 'index.html'), generateIndexHtml(), 'utf-8');
+        writeFileSync(
+          resolve(projectRoot, 'index.html'),
+          generateIndexHtml(readLanguage(projectRoot)),
+          'utf-8',
+        );
       }
     },
 
@@ -81,12 +170,14 @@ function tesseraEntryPlugin(): Plugin {
       if (isBuild) {
         const htmlPath = resolve(projectRoot, 'index.html');
         if (existsSync(htmlPath)) {
-          try { unlinkSync(htmlPath); } catch {}
+          try {
+            unlinkSync(htmlPath);
+          } catch {}
         }
 
-        // Copy assets/ directory to dist/assets/ so $assets/ references resolve
+        // Copy assets/ into the build's assets/ so $assets/ references resolve
         const assetsDir = resolve(projectRoot, 'assets');
-        const distAssetsDir = resolve(projectRoot, 'dist', 'assets');
+        const distAssetsDir = resolve(outDir, 'assets');
         if (existsSync(assetsDir)) {
           mkdirSync(distAssetsDir, { recursive: true });
           cpSync(assetsDir, distAssetsDir, { recursive: true });
@@ -99,7 +190,7 @@ function tesseraEntryPlugin(): Plugin {
       return () => {
         server.middlewares.use(async (req, res, next) => {
           if (req.url === '/' || req.url === '/index.html') {
-            const html = generateIndexHtml();
+            const html = generateIndexHtml(readLanguage(projectRoot));
             const transformed = await server.transformIndexHtml(req.url, html);
             res.setHeader('Content-Type', 'text/html');
             res.statusCode = 200;
@@ -113,7 +204,8 @@ function tesseraEntryPlugin(): Plugin {
 
     resolveId(id) {
       if (id === VIRTUAL_ENTRY_ID) return RESOLVED_ENTRY_ID;
-      if (id === VIRTUAL_MAIN_ID || id === 'virtual:tessera-main') return RESOLVED_MAIN_ID;
+      if (id === VIRTUAL_MAIN_ID || id === 'virtual:tessera-main')
+        return RESOLVED_MAIN_ID;
       return null;
     },
 
@@ -126,9 +218,18 @@ function tesseraEntryPlugin(): Plugin {
   };
 }
 
-function generateIndexHtml(): string {
+// 'en' fallback applied here: the config default-merge runs later than buildStart.
+// Only a validated BCP-47 tag is interpolated into <html lang>, so a malformed
+// value (caught separately as a warning) can't ship a broken attribute.
+function readLanguage(projectRoot: string): string {
+  const read = readCourseConfig(projectRoot);
+  const lang = read.ok ? read.config.language : undefined;
+  return isPlausibleLanguageTag(lang) ? lang : 'en';
+}
+
+function generateIndexHtml(lang: string): string {
   return `<!DOCTYPE html>
-<html lang="en">
+<html lang="${lang}">
 <head>
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@@ -141,15 +242,19 @@ function generateIndexHtml(): string {
 </html>`;
 }
 
-function generateEntryScript(appSveltePath: string, frameworkStylesDir: string, projectRoot: string): string {
+function generateEntryScript(
+  appSveltePath: string,
+  frameworkStylesDir: string,
+  projectRoot: string,
+): string {
   const normalizedPath = appSveltePath.replace(/\\/g, '/');
 
   // Framework CSS imports (theme → base → layout)
   const frameworkCssOrder = ['theme.css', 'base.css', 'layout.css'];
   const frameworkImports = frameworkCssOrder
-    .map(file => resolve(frameworkStylesDir, file).replace(/\\/g, '/'))
-    .filter(path => existsSync(path))
-    .map(path => `import '${path}';`)
+    .map((file) => resolve(frameworkStylesDir, file).replace(/\\/g, '/'))
+    .filter((path) => existsSync(path))
+    .map((path) => `import '${path}';`)
     .join('\n');
 
   // User CSS imports from project's styles/ directory
@@ -157,11 +262,11 @@ function generateEntryScript(appSveltePath: string, frameworkStylesDir: string,
   let userImports = '';
   if (existsSync(userStylesDir)) {
     const userCssFiles = readdirSync(userStylesDir)
-      .filter(f => f.endsWith('.css'))
+      .filter((f) => f.endsWith('.css'))
       .sort();
     userImports = userCssFiles
-      .map(f => resolve(userStylesDir, f).replace(/\\/g, '/'))
-      .map(path => `import '${path}';`)
+      .map((f) => resolve(userStylesDir, f).replace(/\\/g, '/'))
+      .map((path) => `import '${path}';`)
       .join('\n');
   }
 
@@ -191,7 +296,10 @@ function completionDefaults(mode: string | undefined): {
   if (mode === 'manual') {
     return { completion: { mode: 'manual' }, passingScore: 0 };
   }
-  return { completion: { mode: 'percentage', percentageThreshold: 100 }, passingScore: 70 };
+  return {
+    completion: { mode: 'percentage', percentageThreshold: 100 },
+    passingScore: 70,
+  };
 }
 
 function tesseraConfigPlugin(): Plugin {
@@ -206,9 +314,12 @@ function tesseraConfigPlugin(): Plugin {
 
       return {
         base: './',
+        build: {
+          assetsDir: 'tessera',
+        },
         resolve: {
           alias: {
-            '$assets': resolve(root, 'assets'),
+            $assets: resolve(root, 'assets'),
           },
         },
         // tessera-learn ships .ts/.svelte.ts source; Vite's dep optimizer
@@ -231,17 +342,13 @@ function tesseraConfigPlugin(): Plugin {
     load(id) {
       if (id === RESOLVED_CONFIG_ID) {
         const configPath = resolve(projectRoot, 'course.config.js');
-        let userConfig: Record<string, any> = {};
-
-        if (existsSync(configPath)) {
-          this.addWatchFile(configPath);
-          const objectStr = extractDefaultExportObjectLiteral(readFileSync(configPath, 'utf-8'));
-          if (objectStr) {
-            try { userConfig = JSON5.parse(objectStr); } catch {}
-          }
-        }
+        if (existsSync(configPath)) this.addWatchFile(configPath);
+        const read = readCourseConfig(projectRoot);
+        const userConfig: Partial<CourseConfig> = read.ok ? read.config : {};
 
-        const { completion, passingScore } = completionDefaults(userConfig.completion?.mode);
+        const { completion, passingScore } = completionDefaults(
+          userConfig.completion?.mode,
+        );
         const merged = {
           title: userConfig.title || 'Untitled Course',
           ...userConfig,
@@ -261,7 +368,10 @@ function tesseraConfigPlugin(): Plugin {
 // ---------- Manifest Watch Helpers ----------
 
 /** Register all _meta.js and .svelte files under pagesDir as watch files for build mode. */
-function addWatchFiles(ctx: { addWatchFile(id: string): void }, dir: string): void {
+function addWatchFiles(
+  ctx: { addWatchFile(id: string): void },
+  dir: string,
+): void {
   if (!existsSync(dir)) return;
   for (const entry of readdirSync(dir)) {
     const full = resolve(dir, entry);
@@ -330,19 +440,44 @@ function tesseraValidationPlugin(): Plugin {
   };
 }
 
-function runValidation(projectRoot: string): void {
-  const { errors, warnings } = validateProject(projectRoot);
+// Tier 1a: flush + gate the Svelte compiler's a11y warnings at buildEnd, after
+// every module is transformed. svelte() accepts `onwarn` but not arbitrary
+// Rollup hooks, so the gate lives here and shares the onwarn closure.
+function tesseraA11yCompilerPlugin(a11y: A11yCompilerState): Plugin {
+  return {
+    name: 'tessera:a11y-compiler',
+    enforce: 'pre',
 
-  for (const warning of warnings) {
-    console.warn(`\x1b[33m[tessera warning]\x1b[0m ${warning}`);
-  }
+    configResolved(config: ResolvedConfig) {
+      a11y.projectRoot = config.root;
+      a11y.isBuild = config.command === 'build';
+      const read = readCourseConfig(config.root);
+      a11y.settings = normalizeA11y(read.ok ? read.config.a11y : undefined);
+    },
 
-  if (errors.length > 0) {
-    for (const error of errors) {
-      console.error(`\x1b[31m[tessera error]\x1b[0m ${error}`);
-    }
+    buildEnd() {
+      if (!a11y.isBuild || a11y.warnings.length === 0) return;
+      const ignored = new Set(a11y.settings.ignore);
+      const warnings = a11y.warnings.filter((msg) => !isIgnored(msg, ignored));
+      a11y.warnings = [];
+      if (warnings.length === 0) return;
+      if (a11y.settings.level === 'error') {
+        reportValidationIssues({ errors: warnings, warnings: [] });
+        throw new Error(
+          `Tessera: ${warnings.length} a11y issue(s) with a11y.level: 'error'. Fix the errors above to continue.`,
+        );
+      }
+      reportValidationIssues({ errors: [], warnings });
+    },
+  };
+}
+
+function runValidation(projectRoot: string): void {
+  const result = validateProject(projectRoot);
+  reportValidationIssues(result);
+  if (result.errors.length > 0) {
     throw new Error(
-      `Tessera validation failed with ${errors.length} error(s). Fix the errors above to continue.`
+      `Tessera validation failed with ${result.errors.length} error(s). Fix the errors above to continue.`,
     );
   }
 }
@@ -364,34 +499,32 @@ function tesseraExportPlugin(): Plugin {
 
     async closeBundle() {
       if (!isBuild) return;
-
-      const configPath = resolve(projectRoot, 'course.config.js');
-      if (!existsSync(configPath)) {
-        // Validation already required course.config.js — getting here means
-        // the file vanished mid-build. Surface that loudly rather than
-        // shipping a bundle with no LMS export silently.
-        throw new Error(
-          '[tessera:export] course.config.js not found at closeBundle. The file must exist for the export step to run.'
-        );
-      }
-
-      const objectStr = extractDefaultExportObjectLiteral(readFileSync(configPath, 'utf-8'));
-      if (!objectStr) {
-        throw new Error(
-          '[tessera:export] course.config.js: could not locate `export default { ... }`. Cannot determine export.standard.'
-        );
-      }
-
-      let config: any;
-      try {
-        config = JSON5.parse(objectStr);
-      } catch (err) {
+      if (isAuditBuild()) return;
+
+      const read = readCourseConfig(projectRoot);
+      if (!read.ok) {
+        // Validation already required a parseable course.config.js — getting
+        // here means it vanished or broke mid-build. Surface that loudly
+        // rather than shipping a bundle with no LMS export silently.
+        if (read.reason === 'missing') {
+          throw new Error(
+            '[tessera:export] course.config.js not found at closeBundle. The file must exist for the export step to run.',
+          );
+        }
+        if (read.reason === 'no-export') {
+          throw new Error(
+            '[tessera:export] course.config.js: could not locate `export default { ... }`. Cannot determine export.standard.',
+          );
+        }
         throw new Error(
-          `[tessera:export] course.config.js: failed to parse export-default object literal — ${(err as Error).message}`
+          `[tessera:export] course.config.js: failed to parse export-default object literal — ${(read.error as Error).message}`,
         );
       }
 
-      await runExport(projectRoot, config);
+      await runExport(
+        projectRoot,
+        read.config as Parameters<typeof runExport>[1],
+      );
     },
   };
 }
@@ -401,10 +534,12 @@ function tesseraExportPlugin(): Plugin {
 const VIRTUAL_MANIFEST_ID = 'virtual:tessera-manifest';
 const RESOLVED_MANIFEST_ID = '\0' + VIRTUAL_MANIFEST_ID;
 
-function tesseraManifestPlugin(manifestRef: { current: Manifest | null; root: string }): Plugin {
+function tesseraManifestPlugin(manifestRef: {
+  current: Manifest | null;
+  root: string;
+}): Plugin {
   let projectRoot: string;
   let pagesDir: string;
-  let server: ViteDevServer | null = null;
 
   function buildManifest(): Manifest {
     const m = generateManifest(pagesDir);
@@ -423,8 +558,6 @@ function tesseraManifestPlugin(manifestRef: { current: Manifest | null; root: st
     },
 
     configureServer(devServer: ViteDevServer) {
-      server = devServer;
-
       // Watch the pages directory for changes
       devServer.watcher.on('all', (event, filePath) => {
         if (!filePath.startsWith(pagesDir)) return;
@@ -446,7 +579,9 @@ function tesseraManifestPlugin(manifestRef: { current: Manifest | null; root: st
             devServer.ws.send({ type: 'full-reload' });
           }
 
-          console.log(`[tessera] Manifest rebuilt (${event}: ${filePath.replace(projectRoot, '')})`);
+          console.log(
+            `[tessera] Manifest rebuilt (${event}: ${filePath.replace(projectRoot, '')})`,
+          );
         }
       });
     },
@@ -474,7 +609,7 @@ function tesseraManifestPlugin(manifestRef: { current: Manifest | null; root: st
         // scanning .svelte importPath strings as module imports.
         // Replace Infinity with 1e9 since JSON.stringify drops it.
         const json = JSON.stringify(manifestRef.current, (_key, value) =>
-          value === Infinity ? 1e9 : value
+          value === Infinity ? 1e9 : value,
         );
         const b64 = Buffer.from(json).toString('base64');
         return `export default JSON.parse(atob("${b64}"));`;
@@ -515,17 +650,15 @@ function tesseraAdapterPlugin(): Plugin {
       }
 
       let standard = 'web';
-      const configPath = resolve(projectRoot, 'course.config.js');
-      if (existsSync(configPath)) {
-        const objectStr = extractDefaultExportObjectLiteral(readFileSync(configPath, 'utf-8'));
-        if (objectStr) {
-          try {
-            const parsed = JSON5.parse(objectStr);
-            if (typeof parsed?.export?.standard === 'string') standard = parsed.export.standard;
-          } catch {}
-        }
+      const read = readCourseConfig(projectRoot);
+      if (read.ok && typeof read.config.export?.standard === 'string') {
+        standard = read.config.export.standard;
       }
 
+      // The audit renders headless with no LMS in the frame chain; the SCORM/
+      // cmi5 adapters throw when their API is absent, so render with WebAdapter.
+      if (isAuditBuild()) standard = 'web';
+
       switch (standard) {
         case 'scorm12':
           return `
@@ -599,18 +732,18 @@ function tesseraXAPISetupPlugin(): Plugin {
         return `export { buildXAPIClient } from 'tessera-learn/runtime/xapi/setup.js';`;
       }
 
+      // The audit runs offline — don't wire real LRS destinations into it.
+      if (isAuditBuild()) {
+        return `export async function buildXAPIClient() { return null; }`;
+      }
+
       let standard = 'web';
       let hasXapi = false;
-      const configPath = resolve(projectRoot, 'course.config.js');
-      if (existsSync(configPath)) {
-        const objectStr = extractDefaultExportObjectLiteral(readFileSync(configPath, 'utf-8'));
-        if (objectStr) {
-          try {
-            const parsed = JSON5.parse(objectStr);
-            if (typeof parsed?.export?.standard === 'string') standard = parsed.export.standard;
-            hasXapi = parsed?.xapi != null;
-          } catch {}
-        }
+      const read = readCourseConfig(projectRoot);
+      if (read.ok) {
+        if (typeof read.config.export?.standard === 'string')
+          standard = read.config.export.standard;
+        hasXapi = read.config.xapi != null;
       }
 
       // cmi5 needs the publisher regardless of explicit xapi config (cmi5
@@ -624,7 +757,10 @@ function tesseraXAPISetupPlugin(): Plugin {
   };
 }
 
-function tesseraFirstPagePreloadPlugin(manifestRef: { current: Manifest | null; root: string }): Plugin {
+function tesseraFirstPagePreloadPlugin(manifestRef: {
+  current: Manifest | null;
+  root: string;
+}): Plugin {
   return {
     name: 'tessera:first-page-preload',
     apply: 'build',
@@ -633,17 +769,24 @@ function tesseraFirstPagePreloadPlugin(manifestRef: { current: Manifest | null;
       handler(_html, ctx) {
         const firstPagePath = manifestRef.current?.pages[0]?.importPath;
         if (!firstPagePath || !ctx.bundle) return;
-        const normalized = resolve(manifestRef.root, firstPagePath.replace(/^\//, '')).replace(/\\/g, '/');
+        const normalized = resolve(
+          manifestRef.root,
+          firstPagePath.replace(/^\//, ''),
+        ).replace(/\\/g, '/');
         const chunk = Object.values(ctx.bundle).find(
           (c): c is import('vite').Rollup.OutputChunk =>
-            c.type === 'chunk' && !!c.facadeModuleId && c.facadeModuleId.replace(/\\/g, '/') === normalized
+            c.type === 'chunk' &&
+            !!c.facadeModuleId &&
+            c.facadeModuleId.replace(/\\/g, '/') === normalized,
         );
         if (!chunk) return;
-        return [{
-          tag: 'link',
-          attrs: { rel: 'modulepreload', href: `./${chunk.fileName}` },
-          injectTo: 'head',
-        }];
+        return [
+          {
+            tag: 'link',
+            attrs: { rel: 'modulepreload', href: `./${chunk.fileName}` },
+            injectTo: 'head',
+          },
+        ];
       },
     },
   };

package/src/plugin/layout.ts

@@ -1,55 +1,10 @@
-import type { Plugin, ResolvedConfig, ViteDevServer } from 'vite';
-import { existsSync } from 'node:fs';
-import { resolve } from 'node:path';
-
-const VIRTUAL_LAYOUT_ID = 'virtual:tessera-layout';
-const RESOLVED_LAYOUT_ID = '\0' + VIRTUAL_LAYOUT_ID;
+import type { Plugin } from 'vite';
+import { createOverridePlugin } from './override-plugin.js';
 
 export function tesseraLayoutPlugin(): Plugin {
-  let projectRoot: string;
-
-  return {
+  return createOverridePlugin({
     name: 'tessera:layout',
-    enforce: 'pre',
-
-    configResolved(config: ResolvedConfig) {
-      projectRoot = config.root;
-    },
-
-    resolveId(id) {
-      if (id === VIRTUAL_LAYOUT_ID) return RESOLVED_LAYOUT_ID;
-      return null;
-    },
-
-    load(id) {
-      if (id !== RESOLVED_LAYOUT_ID) return null;
-      const layoutPath = resolve(projectRoot, 'layout.svelte');
-      if (existsSync(layoutPath)) {
-        // Register the file with Vite so edits trigger HMR / build --watch
-        // re-runs. Only add when the file actually exists — calling
-        // addWatchFile on a non-existent path makes Vite's importAnalysis
-        // try to resolve it as a real import.
-        this.addWatchFile(layoutPath);
-        const normalized = layoutPath.replace(/\\/g, '/');
-        return `export { default } from '${normalized}';`;
-      }
-      return `export default null;`;
-    },
-
-    configureServer(server: ViteDevServer) {
-      const layoutPath = resolve(projectRoot, 'layout.svelte');
-      // Only react to add/unlink: those flip the virtual module's load() output
-      // between `export default null` and `export { default } from '...'`. A
-      // `change` event leaves that output identical and is handled by Svelte's
-      // own HMR for the underlying file — full-reloading on every edit would
-      // wipe in-page state for no reason.
-      server.watcher.on('all', (event, filePath) => {
-        if (filePath !== layoutPath) return;
-        if (event !== 'add' && event !== 'unlink') return;
-        const mod = server.moduleGraph.getModuleById(RESOLVED_LAYOUT_ID);
-        if (mod) server.moduleGraph.invalidateModule(mod);
-        server.ws.send({ type: 'full-reload' });
-      });
-    },
-  };
+    virtualId: 'virtual:tessera-layout',
+    projectFile: 'layout.svelte',
+  });
 }