@shadowcoderr/context-graph 0.3.2 → 0.3.4

package/dist/storage/engine.js

@@ -37,12 +37,14 @@ exports.StorageEngine = void 0;
 // Developer: Shadow Coderr, Architect
 const fs = __importStar(require("fs-extra"));
 const path = __importStar(require("path"));
+const crypto = __importStar(require("crypto"));
+const version_1 = require("../utils/version");
 const logger_1 = require("../utils/logger");
 class StorageEngine {
     outputDir;
     prettyJson;
     scriptsDir;
-    contentHashHistory = new Map(); // pageName -> array of hashes
+    contentHashHistory = new Map(); // pageName → array of hashes
     forceCapture = false;
     constructor(outputDir, prettyJson = true, forceCapture = false) {
         this.outputDir = path.resolve(outputDir);
@@ -50,44 +52,47 @@ class StorageEngine {
         this.scriptsDir = path.join(this.outputDir, 'scripts');
         this.forceCapture = forceCapture;
     }
-    /**
-     * Set force capture mode - always write artifacts even if content hash unchanged
-     */
+    // ── Configuration ────────────────────────────────────────────────────────────
     setForceCapture(force) {
         this.forceCapture = force;
     }
-    /**
-     * Check if content has changed since last capture
-     */
+    // ── Change detection ─────────────────────────────────────────────────────────
     hasContentChanged(pageName, contentHash) {
         const history = this.contentHashHistory.get(pageName);
         if (!history || history.length === 0)
             return true;
         return !history.includes(contentHash);
     }
-    /**
-     * Record content hash for a page
-     */
     recordContentHash(pageName, contentHash) {
         const history = this.contentHashHistory.get(pageName) || [];
         history.push(contentHash);
-        // Keep last 10 hashes per page
         if (history.length > 10)
             history.shift();
         this.contentHashHistory.set(pageName, history);
     }
+    // ── Initialisation ────────────────────────────────────────────────────────────
     async initialize() {
-        // Create the root output directory and scripts directory
         await fs.ensureDir(this.outputDir);
         await fs.ensureDir(this.scriptsDir);
     }
+    // ── Page directory resolution ─────────────────────────────────────────────────
+    /**
+     * Resolve the on-disk directory for a given page's metadata.
+     * Mirrors the same logic used inside savePageSnapshot so callers can
+     * compute the directory without needing to save first.
+     */
+    resolvePageDir(metadata) {
+        const domainName = this.extractDomainName(metadata.domain);
+        const pageName = metadata.pageName || 'page';
+        return path.join(this.outputDir, domainName, 'pages', pageName);
+    }
+    // ── Script management ─────────────────────────────────────────────────────────
     async getUniqueScriptPath(url) {
         try {
             const urlObj = new URL(url);
-            const hostname = urlObj.hostname.replace(/[^a-zA-Z0-9\-_.]/g, '_'); // Sanitize hostname
+            const hostname = urlObj.hostname.replace(/[^a-zA-Z0-9\-_.]/g, '_');
             let scriptPath = path.join(this.scriptsDir, `${hostname}.spec.ts`);
             let counter = 1;
-            // Check if file exists and increment counter if needed
             while (await fs.pathExists(scriptPath)) {
                 scriptPath = path.join(this.scriptsDir, `${hostname}_${counter}.spec.ts`);
                 counter++;
@@ -96,9 +101,7 @@ class StorageEngine {
         }
         catch (error) {
             logger_1.logger.error(`Error generating unique script path: ${error.message}`);
-            // Fallback to a timestamp-based name
-            const timestamp = Date.now();
-            return path.join(this.scriptsDir, `recording_${timestamp}.spec.ts`);
+            return path.join(this.scriptsDir, `recording_${Date.now()}.spec.ts`);
         }
     }
     async mergeRecordedScript(url, recordedScriptPath) {
@@ -109,7 +112,9 @@ class StorageEngine {
             throw new Error(`Recorded script not found: ${recordedScriptPath}`);
         }
         const incoming = await fs.readFile(recordedScriptPath, 'utf8');
-        const existing = (await fs.pathExists(mergedPath)) ? await fs.readFile(mergedPath, 'utf8') : '';
+        const existing = (await fs.pathExists(mergedPath))
+            ? await fs.readFile(mergedPath, 'utf8')
+            : '';
         const merged = this.mergePlaywrightSpec(existing, incoming);
         await fs.writeFile(mergedPath, merged);
         if (path.resolve(recordedScriptPath) !== path.resolve(mergedPath)) {
@@ -130,11 +135,7 @@ class StorageEngine {
         const takeHeader = (lines) => {
             for (const line of lines) {
                 const trimmed = line.trim();
-                if (!trimmed)
-                    continue;
-                if (!/^import\s/.test(trimmed))
-                    continue;
-                if (seenHeader.has(trimmed))
+                if (!trimmed || !/^import\s/.test(trimmed) || seenHeader.has(trimmed))
                     continue;
                 seenHeader.add(trimmed);
                 header.push(trimmed);
@@ -150,18 +151,14 @@ class StorageEngine {
             let inTest = false;
             for (const line of lines) {
                 if (!inTest) {
-                    if (/^\s*test\(/.test(line)) {
+                    if (/^\s*test\(/.test(line))
                         inTest = true;
-                    }
                     continue;
                 }
-                if (/^\s*\}\);\s*$/.test(line)) {
+                if (/^\s*\}\);\s*$/.test(line))
                     break;
-                }
                 const trimmed = line.trimEnd();
-                if (!trimmed.trim())
-                    continue;
-                if (/^\s*\/\//.test(trimmed))
+                if (!trimmed.trim() || /^\s*\/\//.test(trimmed))
                     continue;
                 steps.push(trimmed);
             }
@@ -192,124 +189,128 @@ class StorageEngine {
             '',
         ].join('\n');
     }
+    // ── Snapshot persistence ──────────────────────────────────────────────────────
     async savePageSnapshot(snapshot) {
         const domain = snapshot.metadata.domain;
-        const pageName = snapshot.metadata.pageName || 'page';
+        let pageName = snapshot.metadata.pageName || 'page';
         const contentHash = snapshot.metadata.contentHash || '';
-        // Derive logical domain name (e.g., www.saucedemo.com -> saucedemo, saucedemo.com -> saucedemo)
-        const domainName = (() => {
-            const parts = domain.split('.');
-            // Remove 'www' prefix if present
-            const filtered = parts.filter(p => p.toLowerCase() !== 'www');
-            // Get the main domain name (second-to-last part, or first if only one part)
-            if (filtered.length >= 2) {
-                return filtered[filtered.length - 2];
-            }
-            return filtered[0] || parts[0];
-        })();
-        const domainDir = path.join(this.outputDir, domainName);
-        const pageDir = path.join(domainDir, 'pages', pageName);
-        // Check if we should save (force capture or content changed)
+        const domainName = this.extractDomainName(domain);
+        let pageDir = path.join(this.outputDir, domainName, 'pages', pageName);
         const shouldSave = this.forceCapture || this.hasContentChanged(pageName, contentHash);
         if (!shouldSave) {
             logger_1.logger.info(`Skipping save for ${pageName}: content unchanged (hash: ${contentHash})`);
             return;
         }
-        logger_1.logger.info(`Saving page snapshot: domain=${domainName}, page=${pageName}, url=${snapshot.metadata.url}, forceCapture=${this.forceCapture}`);
-        await fs.ensureDir(pageDir);
-        // Record the content hash
+        logger_1.logger.info(`Saving page snapshot: domain=${domainName}, page=${pageName}, url=${snapshot.metadata.url}`);
+        try {
+            await fs.ensureDir(pageDir);
+        }
+        catch (error) {
+            const msg = error.message;
+            logger_1.logger.warn(`Failed to create directory '${pageDir}': ${msg}. Attempting fallback...`);
+            // Fallback: Use a shorter, safe name with a hash if the original name fails (likely due to length or invalid chars)
+            const safeHash = crypto.createHash('md5').update(snapshot.metadata.url).digest('hex').substring(0, 8);
+            pageName = `page-${safeHash}`;
+            pageDir = path.join(this.outputDir, domainName, 'pages', pageName);
+            // Update metadata so it's consistent with the actual folder name
+            snapshot.metadata.pageName = pageName;
+            logger_1.logger.info(`Using fallback directory: ${pageDir}`);
+            await fs.ensureDir(pageDir);
+        }
         if (contentHash) {
             this.recordContentHash(pageName, contentHash);
         }
-        // Save metadata
+        // ── Core files ──
         await this.writeJson(path.join(pageDir, 'metadata.json'), snapshot.metadata);
-        // Save DOM snapshot as 'DOM' file (beautified)
-        const beautifiedDOM = this.beautifyHTML(snapshot.domSnapshot);
-        await fs.writeFile(path.join(pageDir, 'DOM'), beautifiedDOM);
-        // Save accessibility tree
+        await fs.writeFile(path.join(pageDir, 'DOM'), this.beautifyHTML(snapshot.domSnapshot));
         await this.writeJson(path.join(pageDir, 'a11y_tree.json'), snapshot.a11yTree);
-        // Save locators
         await this.writeJson(path.join(pageDir, 'locators.json'), snapshot.locators);
-        // Save frames
+        // ── Frames ──
+        await this.saveFrames(snapshot, pageDir);
+        // ── Console errors / warnings ──
+        const consoleErrors = {
+            errors: snapshot.consoleMessages
+                .filter((m) => m.type === 'error')
+                .map((m) => ({
+                timestamp: m.timestamp,
+                message: m.message,
+                source: `${m.location?.url || ''}:${m.location?.lineNumber || 0}:${m.location?.columnNumber || 0}`,
+                stack: m.stack,
+            })),
+            warnings: snapshot.consoleMessages
+                .filter((m) => m.type === 'warn')
+                .map((m) => ({
+                timestamp: m.timestamp,
+                message: m.message,
+                source: `${m.location?.url || ''}:${m.location?.lineNumber || 0}:${m.location?.columnNumber || 0}`,
+            })),
+        };
+        if (consoleErrors.errors.length > 0 || consoleErrors.warnings.length > 0) {
+            await this.writeJson(path.join(pageDir, 'console_errors.json'), consoleErrors);
+        }
+        // ── Screenshot paths (written into metadata after screenshot capture) ──
+        if (snapshot.screenshotPaths.length > 0) {
+            await this.writeJson(path.join(pageDir, 'screenshot_manifest.json'), {
+                capturedAt: new Date().toISOString(),
+                paths: snapshot.screenshotPaths,
+                count: snapshot.screenshotPaths.length,
+            });
+        }
+        // ── Network events (save summary) ──
+        if (snapshot.networkEvents.length > 0) {
+            const networkDir = path.join(this.outputDir, domainName, 'network');
+            await fs.ensureDir(networkDir);
+            const trafficLog = path.join(networkDir, 'traffic_log.jsonl');
+            const lines = snapshot.networkEvents.map(e => JSON.stringify(e)).join('\n') + '\n';
+            await fs.appendFile(trafficLog, lines);
+        }
+        logger_1.logger.info(`Saved page snapshot: ${pageName}`);
+    }
+    async saveFrames(snapshot, pageDir) {
         await this.writeJson(path.join(pageDir, 'frames.json'), snapshot.frames);
-        // Save serialized frame contents as separate files where present
         const framesDir = path.join(pageDir, 'frames');
         await fs.ensureDir(framesDir);
         let frameCounter = 0;
         const writeFrame = async (frame) => {
             const id = `frame_${String(frameCounter++).padStart(3, '0')}`;
-            if (frame && frame.content) {
+            if (frame?.content) {
                 const filename = path.join(framesDir, `${id}_${(frame.name || 'main').replace(/[^a-z0-9\-_.]/gi, '_')}.html`);
                 await fs.writeFile(filename, frame.content);
-                // Replace content with relative path reference to keep JSON small
                 frame.contentFile = path.relative(pageDir, filename).replace(/\\/g, '/');
             }
-            if (frame && frame.children && frame.children.length > 0) {
-                for (const child of frame.children) {
+            if (frame?.children?.length) {
+                for (const child of frame.children)
                     await writeFrame(child);
-                }
-            }
-        };
-        try {
-            if (snapshot.frames) {
-                await writeFrame(snapshot.frames);
-                // Rewrite frames.json to include contentFile references
-                await this.writeJson(path.join(pageDir, 'frames.json'), snapshot.frames);
             }
-        }
-        catch (err) {
-            logger_1.logger.warn('Failed to write frame contents: ' + err.message);
-        }
-        // Save console errors and warnings (separate file)
-        const consoleErrors = {
-            errors: snapshot.consoleMessages
-                .filter((msg) => msg.type === 'error')
-                .map((msg) => ({
-                timestamp: msg.timestamp,
-                message: msg.message,
-                source: `${msg.location?.url || ''}:${msg.location?.lineNumber || 0}:${msg.location?.columnNumber || 0}`,
-                stack: msg.stack,
-            })),
-            warnings: snapshot.consoleMessages
-                .filter((msg) => msg.type === 'warn')
-                .map((msg) => ({
-                timestamp: msg.timestamp,
-                message: msg.message,
-                source: `${msg.location?.url || ''}:${msg.location?.lineNumber || 0}:${msg.location?.columnNumber || 0}`,
-            })),
         };
-        if (consoleErrors.errors.length > 0 || consoleErrors.warnings.length > 0) {
-            await this.writeJson(path.join(pageDir, 'console_errors.json'), consoleErrors);
+        if (snapshot.frames) {
+            await writeFrame(snapshot.frames).catch(err => logger_1.logger.warn('Failed to write frame contents: ' + err.message));
+            await this.writeJson(path.join(pageDir, 'frames.json'), snapshot.frames);
         }
-        logger_1.logger.info(`Saved page snapshot: ${pageName}`);
     }
-    /**
-     * Save the components registry and update manifest reference
-     */
+    // ── Components registry ────────────────────────────────────────────────────────
     async saveComponentsRegistry(registry, domainName) {
         const registryPath = path.join(this.outputDir, domainName, 'components_registry.json');
         await fs.ensureDir(path.dirname(registryPath));
         await this.writeJson(registryPath, registry);
         logger_1.logger.info(`Saved components registry to ${registryPath}`);
     }
-    /**
-     * Update manifest with components registry reference
-     */
     async updateManifestWithComponents(domainName, totalComponents) {
         const manifestPath = path.join(this.outputDir, 'global_manifest.json');
-        if (await fs.pathExists(manifestPath)) {
-            const manifest = await fs.readJson(manifestPath);
-            manifest.componentsRegistry = {
-                path: `${domainName}/components_registry.json`,
-                totalComponents,
-                lastUpdated: new Date().toISOString(),
-            };
-            manifest.statistics.totalComponents = totalComponents;
-            manifest.lastUpdated = new Date().toISOString();
-            await this.writeJson(manifestPath, manifest);
-        }
+        if (!(await fs.pathExists(manifestPath)))
+            return;
+        const manifest = await fs.readJson(manifestPath);
+        manifest.componentsRegistry = {
+            path: `${domainName}/components_registry.json`,
+            totalComponents,
+            lastUpdated: new Date().toISOString(),
+        };
+        manifest.statistics.totalComponents = totalComponents;
+        manifest.lastUpdated = new Date().toISOString();
+        await this.writeJson(manifestPath, manifest);
     }
-    async updateGlobalManifest(entry) {
+    // ── Global manifest ────────────────────────────────────────────────────────────
+    async updateGlobalManifest(entry, extras = {}) {
         const manifestPath = path.join(this.outputDir, 'global_manifest.json');
         let manifest;
         if (await fs.pathExists(manifestPath)) {
@@ -317,7 +318,7 @@ class StorageEngine {
         }
         else {
             manifest = {
-                version: '0.3.0',
+                version: (0, version_1.getVersion)(),
                 createdAt: new Date().toISOString(),
                 lastUpdated: new Date().toISOString(),
                 sessions: [],
@@ -328,11 +329,11 @@ class StorageEngine {
                     totalPages: 0,
                     totalNetworkRequests: 0,
                     totalScreenshots: 0,
-                    storageSize: '0 MB',
+                    storageSize: '0 KB',
                 },
             };
         }
-        // Update domains
+        // ── Update domains ──
         let domainEntry = manifest.domains.find(d => d.domain === entry.domain);
         if (!domainEntry) {
             domainEntry = {
@@ -347,82 +348,119 @@ class StorageEngine {
         domainEntry.lastVisited = entry.timestamp;
         domainEntry.totalVisits++;
         domainEntry.pages.push(entry);
-        // Update statistics
+        // ── Update statistics ──
+        manifest.statistics.totalDomains = manifest.domains.length;
         manifest.statistics.totalPages = manifest.domains.reduce((sum, d) => sum + d.pages.length, 0);
+        manifest.statistics.totalNetworkRequests =
+            (manifest.statistics.totalNetworkRequests || 0) + (extras.networkRequests ?? 0);
+        manifest.statistics.totalScreenshots =
+            (manifest.statistics.totalScreenshots || 0) + (extras.screenshots ?? 0);
+        // Compute actual storage size (non-blocking — best effort)
+        try {
+            const bytes = await this.computeDirectorySizeBytes(this.outputDir);
+            manifest.statistics.storageSize = this.formatBytes(bytes);
+        }
+        catch {
+            // Leave existing value if directory walk fails
+        }
         manifest.lastUpdated = new Date().toISOString();
         await this.writeJson(manifestPath, manifest);
     }
-    async writeJson(filePath, data) {
-        const jsonString = this.prettyJson
-            ? JSON.stringify(data, null, 2)
-            : JSON.stringify(data);
-        await fs.writeFile(filePath, jsonString);
-    }
-    /**
-     * Beautify HTML by adding proper indentation and line breaks
-     * This makes the DOM more readable for RAG/context analysis
-     * Properly handles self-closing tags and preserves HTML structure
-     */
+    // ── User interactions ──────────────────────────────────────────────────────────
     async saveUserInteractions(url, interactions) {
         try {
             const urlObj = new URL(url);
-            const domain = urlObj.hostname;
-            // Derive logical domain name
-            const domainName = (() => {
-                const parts = domain.split('.');
-                const filtered = parts.filter(p => p.toLowerCase() !== 'www');
-                if (filtered.length >= 2) {
-                    return filtered[filtered.length - 2];
-                }
-                return filtered[0] || parts[0];
-            })();
+            const domainName = this.extractDomainName(urlObj.hostname);
             const domainDir = path.join(this.outputDir, domainName);
             const interactionsFile = path.join(domainDir, 'user_interactions.json');
             await fs.ensureDir(domainDir);
-            // Load existing interactions or create new array
-            let existingInteractions = [];
+            let existing = [];
             if (await fs.pathExists(interactionsFile)) {
-                existingInteractions = await fs.readJson(interactionsFile);
+                existing = await fs.readJson(interactionsFile);
             }
-            // Add new interactions with page URL
-            const interactionsWithUrl = interactions.map(interaction => ({
-                ...interaction,
+            const stamped = interactions.map(i => ({
+                ...i,
                 pageUrl: url,
-                recordedAt: new Date().toISOString()
+                recordedAt: new Date().toISOString(),
             }));
-            // Merge with existing interactions
-            const allInteractions = [...existingInteractions, ...interactionsWithUrl];
-            // Save all interactions
-            await this.writeJson(interactionsFile, allInteractions);
+            await this.writeJson(interactionsFile, [...existing, ...stamped]);
             logger_1.logger.info(`Saved ${interactions.length} user interactions to ${interactionsFile}`);
         }
         catch (error) {
             logger_1.logger.error(`Failed to save user interactions: ${error.message}`);
         }
     }
+    // ── Private helpers ────────────────────────────────────────────────────────────
+    extractDomainName(domain) {
+        const parts = domain.split('.');
+        const filtered = parts.filter(p => p.toLowerCase() !== 'www');
+        if (filtered.length >= 2)
+            return filtered[filtered.length - 2];
+        return filtered[0] || parts[0];
+    }
+    async writeJson(filePath, data) {
+        const jsonString = this.prettyJson
+            ? JSON.stringify(data, null, 2)
+            : JSON.stringify(data);
+        await fs.writeFile(filePath, jsonString);
+    }
+    /**
+     * Recursively walk a directory and sum all file sizes in bytes.
+     * Returns 0 if the directory does not exist.
+     */
+    async computeDirectorySizeBytes(dir) {
+        if (!(await fs.pathExists(dir)))
+            return 0;
+        let total = 0;
+        const entries = await fs.readdir(dir, { withFileTypes: true });
+        for (const entry of entries) {
+            const full = path.join(dir, entry.name);
+            if (entry.isDirectory()) {
+                total += await this.computeDirectorySizeBytes(full);
+            }
+            else if (entry.isFile()) {
+                try {
+                    const stat = await fs.stat(full);
+                    total += stat.size;
+                }
+                catch {
+                    // File may have been removed during iteration
+                }
+            }
+        }
+        return total;
+    }
+    formatBytes(bytes) {
+        if (bytes < 1024)
+            return `${bytes} B`;
+        if (bytes < 1024 * 1024)
+            return `${(bytes / 1024).toFixed(1)} KB`;
+        if (bytes < 1024 * 1024 * 1024)
+            return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+        return `${(bytes / (1024 * 1024 * 1024)).toFixed(2)} GB`;
+    }
+    /**
+     * Beautify HTML by adding proper indentation and line breaks.
+     * Self-closing / void elements are handled correctly so the indent
+     * level is never corrupted by unclosed tags.
+     */
     beautifyHTML(html) {
         try {
-            if (!html || html.trim().length === 0) {
+            if (!html?.trim())
                 return html;
-            }
-            // Use a proper HTML parser approach - format with indentation
-            // Split by tags while preserving them
             const parts = [];
             const tagRegex = /(<[^>]+>)/g;
             let lastIndex = 0;
             let match;
             while ((match = tagRegex.exec(html)) !== null) {
-                // Add text before tag
                 if (match.index > lastIndex) {
                     const text = html.substring(lastIndex, match.index).trim();
                     if (text)
                         parts.push(text);
                 }
-                // Add tag
                 parts.push(match[0]);
                 lastIndex = match.index + match[0].length;
             }
-            // Add remaining text
             if (lastIndex < html.length) {
                 const text = html.substring(lastIndex).trim();
                 if (text)
@@ -431,45 +469,41 @@ class StorageEngine {
             const indentSize = 2;
             let indent = 0;
             const result = [];
-            const voidElements = new Set(['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source', 'track', 'wbr', 'noscript']);
-            for (let i = 0; i < parts.length; i++) {
-                const part = parts[i].trim();
-                if (!part)
+            const voidElements = new Set([
+                'area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input',
+                'link', 'meta', 'param', 'source', 'track', 'wbr', 'noscript',
+            ]);
+            for (const part of parts) {
+                const p = part.trim();
+                if (!p)
                     continue;
-                if (part.startsWith('<!DOCTYPE')) {
-                    result.push(part);
+                if (p.startsWith('<!DOCTYPE')) {
+                    result.push(p);
                 }
-                else if (part.startsWith('<!--')) {
-                    result.push(' '.repeat(indent) + part);
+                else if (p.startsWith('<!--')) {
+                    result.push(' '.repeat(indent) + p);
                 }
-                else if (part.startsWith('</')) {
-                    // Closing tag
+                else if (p.startsWith('</')) {
                     indent = Math.max(0, indent - indentSize);
-                    result.push(' '.repeat(indent) + part);
+                    result.push(' '.repeat(indent) + p);
                 }
-                else if (part.startsWith('<')) {
-                    // Opening tag
-                    const tagName = part.match(/^<(\w+)/)?.[1]?.toLowerCase();
-                    const isSelfClosing = part.endsWith('/>') || (tagName && voidElements.has(tagName));
-                    result.push(' '.repeat(indent) + part);
+                else if (p.startsWith('<')) {
+                    const tagName = p.match(/^<(\w+)/)?.[1]?.toLowerCase();
+                    const isSelfClosing = p.endsWith('/>') || (tagName && voidElements.has(tagName));
+                    result.push(' '.repeat(indent) + p);
                     if (!isSelfClosing && tagName !== 'script' && tagName !== 'style') {
                         indent += indentSize;
                     }
                 }
                 else {
-                    // Text content
-                    const lines = part.split(/\n/).filter(l => l.trim());
-                    for (const line of lines) {
-                        if (line.trim()) {
-                            result.push(' '.repeat(indent) + line.trim());
-                        }
+                    for (const line of p.split(/\n/).filter(l => l.trim())) {
+                        result.push(' '.repeat(indent) + line.trim());
                     }
                 }
             }
             return result.join('\n');
         }
         catch (error) {
-            // If beautification fails, return original
             logger_1.logger.warn('HTML beautification failed, using original: ' + error.message);
             return html;
         }