go-duck-cli 1.0.8 → 1.1.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "go-duck-cli",
-  "version": "1.0.8",
-  "description": "go function generator",
+  "version": "1.1.1",
+  "description": "The Ultimate Evolutionary Go Microservice Scaffolder.",
   "main": "index.js",
   "type": "module",
   "bin": {
@@ -15,9 +15,11 @@
   "dependencies": {
     "chalk": "^4.1.2",
     "commander": "^14.0.3",
+    "express": "^5.2.1",
     "fs-extra": "^11.3.4",
     "handlebars": "^4.7.8",
     "inquirer": "^8.2.7",
-    "js-yaml": "^4.1.1"
+    "js-yaml": "^4.1.1",
+    "open": "^11.0.0"
   }
-}
+}

package/parser/gdl.js

@@ -21,7 +21,10 @@ import path from 'path';
  */
 
 export const parseGDL = async (filePath) => {
-    const content = await fs.readFile(filePath, 'utf8');
+    const rawContent = await fs.readFile(filePath, 'utf8');
+    // Strip single-line (//) and multi-line (/* */) comments to prevent parsing artifacts
+    const content = rawContent.replace(/\/\/.*|\/\*[\s\S]*?\*\//g, '');
+    
     const entities = [];
     const relationships = [];
     const enums = [];
@@ -35,39 +38,122 @@ export const parseGDL = async (filePath) => {
         enums.push({ name, values });
     }
 
-    // Parse entity blocks
-    const entityRegex = /(@\w+\s+)?entity\s+(\w+)\s*\{([\s\S]*?)\}/g;
-    while ((match = entityRegex.exec(content)) !== null) {
-        const annotation = match[1]?.trim();
-        const name = match[2];
-        const fieldBlock = match[3];
+    // 🦆 RECURSIVE BLOCK PARSER: Correctly handles nested braces for @Document entities
+    const parseEntityBlocks = (content) => {
+        const entityBlocks = [];
+        const entityStartRegex = /((?:@\w+\s*)*)entity\s+(\w+)\s*\{/g;
+        let match;
+
+        while ((match = entityStartRegex.exec(content)) !== null) {
+            const annotation = match[1]?.trim();
+            const name = match[2];
+            if (name === 'relationship' || name === 'enum') continue;
+
+            const startIndex = match.index + match[0].length;
+            let braceCount = 1;
+            let index = startIndex;
 
-        if (name === 'relationship' || name === 'enum') continue;
+            while (braceCount > 0 && index < content.length) {
+                if (content[index] === '{') braceCount++;
+                if (content[index] === '}') braceCount--;
+                index++;
+            }
+
+            const fieldBlock = content.substring(startIndex, index - 1);
+            entityBlocks.push({ name, annotation, fieldBlock });
+        }
+        return entityBlocks;
+    };
 
+    const parseFields = (block) => {
         const fields = [];
-        const fieldLines = fieldBlock.split('\n').map(l => l.trim()).filter(l => l.length > 0);
+        const lines = block.split('\n').map(l => l.trim()).filter(l => l.length > 0);
+        let i = 0;
+
+        while (i < lines.length) {
+            const line = lines[i];
+            const parts = line.split(/\s+/).filter(p => p.length > 0);
+            if (parts.length < 1) { i++; continue; }
+
+            // Extract field annotations
+            const fieldAnnotations = parts.filter(p => p.startsWith('@'));
+            const dataParts = parts.filter(p => !p.startsWith('@'));
 
-        for (const line of fieldLines) {
-            const parts = line.split(/\s+/);
-            if (parts.length < 2) continue;
+            // Check if this line starts a nested block like "clinicalData {"
+            if (line.includes('{')) {
+                let fieldName = dataParts[0] || 'unknown';
+                if (line.includes('{')) {
+                    const nestedBlockStart = line.indexOf('{');
+                    fieldName = line.substring(0, nestedBlockStart).trim().split(/\s+/).pop();
+                }
+                
+                // Extract the nested block by finding the matching brace in the block
+                let nestedBraceCount = 1;
+                let nestedContent = '';
+                
+                const fullRemainingBlock = block.substring(block.indexOf(line) + line.indexOf('{') + 1);
+                let charIndex = 0;
+                while (nestedBraceCount > 0 && charIndex < fullRemainingBlock.length) {
+                    if (fullRemainingBlock[charIndex] === '{') nestedBraceCount++;
+                    if (fullRemainingBlock[charIndex] === '}') nestedBraceCount--;
+                    if (nestedBraceCount > 0) nestedContent += fullRemainingBlock[charIndex];
+                    charIndex++;
+                }
+
+                fields.push({
+                    name: fieldName,
+                    type: 'Object',
+                    isNested: true,
+                    annotations: fieldAnnotations,
+                    children: parseFields(nestedContent)
+                });
+
+                const nestedLineCount = nestedContent.split('\n').length;
+                i += nestedLineCount + 1;
+                continue;
+            }
 
-            const fieldName = parts[0];
-            let rawType = parts[1];
+            if (dataParts.length < 2) { i++; continue; }
 
-            // Support String(N) for custom VARCHAR sizes
+            let fieldName = dataParts[0];
+            let rawType = dataParts[1];
+
+            // Standard parsing logic for simple fields
+            const typeKeywords = ['string', 'text', 'int', 'long', 'float', 'bigdecimal', 'bool', 'boolean', 'datetime', 'localdate', 'json', 'jsonb', 'uuid', 'instant'];
+            const isKnownType = typeKeywords.some(tk => dataParts[0].toLowerCase().startsWith(tk));
+            const isKnownEnum = enums.some(e => e.name.toLowerCase() === dataParts[0].toLowerCase());
+            
+            if (isKnownType || isKnownEnum) {
+                fieldName = dataParts[1];
+                rawType = dataParts[0];
+            }
+
+            // Standardize capitalization for the factory
+            rawType = rawType.charAt(0).toUpperCase() + rawType.slice(1).toLowerCase();
+            if (rawType.toLowerCase().startsWith('string(')) rawType = 'String' + rawType.slice(6);
+            if (rawType.startsWith('Float')) rawType = 'Float';
+            if (rawType === 'Int' || rawType.startsWith('Int(')) rawType = 'Integer';
+            if (rawType === 'Bool') rawType = 'Boolean';
+
+            // Support String(N) or Int(N) for custom sizing
             let varcharSize = 255;
-            const sizeMatch = rawType.match(/^String\((\d+)\)$/);
+            const sizeMatch = rawType.match(/^(?:String|Integer)\((\d+)\)$/i);
             if (sizeMatch) {
                 varcharSize = parseInt(sizeMatch[1], 10);
-                rawType = 'String';
+                rawType = rawType.startsWith('String') ? 'String' : 'Integer';
             }
 
             const required = line.includes('required');
             const unique = line.includes('unique');
             const isText = rawType === 'Text';
+            const isVersion = fieldAnnotations.includes('@Version');
 
             // Check if type is an Enum
-            const isEnum = enums.some(e => e.name === rawType);
+            const isEnum = enums.some(e => e.name.toLowerCase() === rawType.toLowerCase());
+            if (isEnum) {
+                const en = enums.find(e => e.name.toLowerCase() === rawType.toLowerCase());
+                rawType = en.name; // Use correct case
+            }
 
             fields.push({
                 name: fieldName,
@@ -75,15 +161,41 @@ export const parseGDL = async (filePath) => {
                 required,
                 unique,
                 isEnum,
+                isVersion,
+                annotations: fieldAnnotations,
                 varcharSize: rawType === 'String' ? varcharSize : null,
             });
+            i++;
         }
+        return fields;
+    };
+    const entityBlocks = parseEntityBlocks(content);
+    for (const block of entityBlocks) {
+        const annotation = block.annotation;
+        const name = block.name;
 
-        entities.push({ name, annotation, fields });
+        const isAudited = annotation?.includes('@Audited');
+        const isFederated = annotation?.includes('@Federated');
+        const isSearchable = annotation?.includes('@Searchable');
+        const isDocument = annotation?.includes('@Document') || annotation?.includes('@isDocument');
+        const isEmbedded = annotation?.includes('@Embed');
+
+        const fields = parseFields(block.fieldBlock);
+
+        entities.push({ 
+            name, 
+            annotation, 
+            isAudited, 
+            isFederated, 
+            isSearchable,
+            isDocument,
+            isEmbedded,
+            fields 
+        });
     }
 
-    // Parse relationship blocks
-    const relRegex = /relationship\s+(\w+)\s*\{([\s\S]*?)\n\}/g;
+    // Parse relationship blocks (Robust whitespace handling)
+    const relRegex = /relationship\s+(\w+)\s*\{([\s\S]*?)\}/g;
     while ((match = relRegex.exec(content)) !== null) {
         const type = match[1];
         const relBlock = match[2];
@@ -94,8 +206,12 @@ export const parseGDL = async (filePath) => {
             if (relParts.length !== 2) continue;
 
             const parseRelPart = (p) => {
-                const m = p.match(/(\w+)\s*\{\s*(\w+)\s*\}/);
-                return m ? { entity: m[1], field: m[2] } : null;
+                // Support both "Parent{id}" and "Parent"
+                const mWithBraces = p.match(/(\w+)\s*\{\s*(\w+)\s*\}/);
+                if (mWithBraces) return { entity: mWithBraces[1], field: mWithBraces[2] };
+                
+                const mSimple = p.match(/^(\w+)/);
+                return mSimple ? { entity: mSimple[1], field: null } : null;
             };
 
             // Support required FK: "required" keyword anywhere in the line
@@ -110,7 +226,30 @@ export const parseGDL = async (filePath) => {
         }
     }
 
-    return { entities, relationships, enums };
+    // Parse open entities
+    const openEntities = [];
+    const openRegex = /open\s+(.*)/g;
+    while ((match = openRegex.exec(content)) !== null) {
+        const val = match[1].trim();
+        // Split by comma but ignore commas inside parentheses
+        const items = val.split(/,(?![^\(]*\))/).map(v => v.trim()).filter(v => v.length > 0);
+        
+        for (const item of items) {
+             const itemMatch = item.match(/^([\w\*]+)(?:\s*\((.*?)\))?$/);
+             if (itemMatch) {
+                 const name = itemMatch[1];
+                 const actionStr = itemMatch[2];
+                 let actions = ['read', 'create', 'update', 'delete'];
+                 if (actionStr) {
+                     actions = actionStr.split(/[\s,]+/).map(a => a.trim().toLowerCase()).filter(a => a.length > 0);
+                 }
+                 
+                 openEntities.push({ name, actions });
+             }
+        }
+    }
+
+    return { entities, relationships, enums, openEntities };
 };
 
 /**

package/templates/docs/index.html.hbs

@@ -41,7 +41,7 @@
                 <li class="pt-2 pb-1"><span class="font-semibold text-gray-800">5. Observability</span></li>
                 <li><a href="#observability" class="text-gray-600 hover:text-indigo-600 hover:font-medium transition-colors pl-4 block">OTel & Datadog</a></li>
                 <li class="pt-2 pb-1"><span class="font-semibold text-gray-800">6. Migrations</span></li>
-                <li><a href="#liquibase" class="text-gray-600 hover:text-indigo-600 hover:font-medium transition-colors pl-4 block">Liquibase & GDL</a></li>
+                <li><a href="#goose" class="text-gray-600 hover:text-indigo-600 hover:font-medium transition-colors pl-4 block">Goose SQL & GDL</a></li>
             </ul>
         </aside>
 
@@ -206,12 +206,12 @@ res, err := client.Get{{#if entities.length}}{{capitalize entities.[0].name}}{{e
                 </ul>
             </section>
 
-            <!-- Liquibase & GDL -->
-            <section id="liquibase" class="content-section">
+            <!-- Goose & GDL -->
+            <section id="goose" class="content-section">
                 <h2 class="text-2xl font-bold text-gray-800 mb-4 border-b pb-2">6. Advanced Migrations & GDL</h2>
-                <p class="mb-4">Running <code>go-duck import-gdl</code> calculates stateful differences using the `.go-duck/` snapshot folder. It generates atomic, timestamped Liquibase XML changelogs in <code>migrations/liquibase/changelogs/</code>.</p>
+                <p class="mb-4">Running <code>go-duck import-gdl</code> calculates stateful differences using the `.go-duck/` snapshot folder. It generates atomic, Go-embedded timestamped Goose SQL migrations in <code>migrations/sql/</code>.</p>
                 <ul class="list-disc pl-6 space-y-2">
-                    <li>The application auto-generates <code>master.xml</code> dynamically without "ghost" references.</li>
+                    <li>The application natively compiles SQL inside the Go binary via <code>go:embed</code>.</li>
                     <li>Includes smart nullability and automatic indexing for Foreign Keys.</li>
                     <li><strong>Needle Support:</strong> We inject `// go-duck-needle-*` markers in <code>main.go</code> and <code>grpc.go</code> for safe evolutionary code additions without destroying manual updates.</li>
                 </ul>

package/templates/docs/layout.hbs

@@ -1,105 +1,264 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" class="scroll-smooth">
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>{{appName}} - {{title}}</title>
     <script src="https://cdn.tailwindcss.com"></script>
-    <link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&display=swap" rel="stylesheet">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/vs2015.min.css">
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700;800&family=JetBrains+Mono:wght@400;500&display=swap" rel="stylesheet">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/github-dark.min.css">
     <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/highlight.min.js"></script>
     <script>
         tailwind.config = {
             theme: {
                 extend: {
-                    fontFamily: { sans: ['Inter', 'sans-serif'] },
+                    fontFamily: { 
+                        sans: ['Inter', 'sans-serif'],
+                        mono: ['JetBrains Mono', 'monospace'],
+                    },
                 }
             }
         }
     </script>
     <script>hljs.highlightAll();</script>
     <style>
-        .gradient-text { background: linear-gradient(90deg, #818cf8, #c084fc); -webkit-background-clip: text; -webkit-text-fill-color: transparent; }
+        .gradient-text { background: linear-gradient(135deg, #6366f1, #a855f7, #ec4899); -webkit-background-clip: text; -webkit-text-fill-color: transparent; }
         ::-webkit-scrollbar { width: 6px; }
-        ::-webkit-scrollbar-thumb { background: #cbd5e1; border-radius: 4px; }
+        ::-webkit-scrollbar-track { background: #f1f5f9; }
+        ::-webkit-scrollbar-thumb { background: #cbd5e1; border-radius: 10px; }
+        ::-webkit-scrollbar-thumb:hover { background: #94a3b8; }
+        
+        .sidebar-link-active {
+            background-color: #ebf5ff;
+            color: #1e40af;
+            border-right: 4px solid #3b82f6;
+            font-weight: 600;
+        }
+
+        #sidebar {
+            width: 280px;
+            height: calc(100vh - 64px);
+            position: fixed;
+            top: 64px;
+            left: 0;
+            overflow-y: auto;
+            border-right: 1px solid #e2e8f0;
+            background: #ffffff;
+            z-index: 30;
+        }
+
+        #content-wrapper {
+            margin-left: 280px;
+            padding-top: 64px;
+            min-height: 100vh;
+            background: #ffffff;
+        }
+
+        @media (max-width: 1024px) {
+            #sidebar {
+                transform: translateX(-100%);
+                transition: transform 0.3s ease;
+            }
+            #sidebar.open {
+                transform: translateX(0);
+            }
+            #content-wrapper {
+                margin-left: 0;
+            }
+        }
+
+        .prose pre {
+            background-color: #0f172a !important;
+            border-radius: 0.75rem;
+            border: 1px solid #1e293b;
+            color: #00ff41 !important;
+            box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05);
+        }
+        .prose pre code {
+            color: inherit !important;
+            text-shadow: 0 0 5px rgba(0, 255, 65, 0.2);
+        }
+        .prose code:not(pre code) {
+            background-color: #f1f5f9;
+            color: #0f172a;
+            padding: 0.2rem 0.4rem;
+            border-radius: 0.375rem;
+            font-weight: 600;
+        }
+        @keyframes float {
+            0% { transform: translateY(0px); }
+            50% { transform: translateY(-15px); }
+            100% { transform: translateY(0px); }
+        }
+        .animate-float {
+            animation: float 6s ease-in-out infinite;
+        }
     </style>
 </head>
-<body class="bg-slate-50 text-slate-800 font-sans antialiased selection:bg-indigo-300 selection:text-indigo-900">
-    <!-- Navbar -->
-    <nav class="bg-slate-900/95 backdrop-blur-md shadow-lg fixed w-full z-30 top-0 h-16 flex items-center px-6 border-b border-slate-800">
+<body class="bg-white text-slate-900 font-sans antialiased selection:bg-blue-100 selection:text-blue-900 overflow-x-hidden">
+
+    <!-- Header Navbar -->
+    <nav class="fixed top-0 left-0 right-0 h-16 bg-white border-b border-slate-200 z-50 flex items-center px-6 justify-between">
         <div class="flex items-center">
-            <img src="logo.png" alt="GO-DUCK Logo" class="h-10 w-auto mr-4 rounded-lg shadow-sm">
-            <div class="text-xl font-bold text-white tracking-tight">GO-DUCK <span class="text-indigo-300 text-xs font-semibold ml-2 inline-flex items-center px-2 py-0.5 rounded-full bg-indigo-500/20 border border-indigo-500/30 uppercase tracking-wider hidden sm:inline-flex">Developer Guide</span></div>
+            <button id="mobile-menu-btn" class="lg:hidden mr-4 p-2 text-slate-600 hover:bg-slate-100 rounded-lg">
+                <svg class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16"></path></svg>
+            </button>
+            <div class="relative group cursor-pointer mr-3">
+                <div class="absolute -inset-1.5 bg-gradient-to-tr from-indigo-500/20 to-purple-500/20 rounded-xl blur opacity-0 group-hover:opacity-100 transition-all duration-500"></div>
+                <img src="logo.png" alt="GO-DUCK Logo" class="relative h-10 w-auto transform hover:scale-105 transition-all duration-300 drop-shadow-sm">
+            </div>
+            <h1 class="text-xl font-bold text-slate-900 tracking-tight flex items-center">
+                GO-DUCK
+                <span class="ml-3 px-2 py-0.5 bg-slate-100 text-slate-500 text-[10px] uppercase tracking-widest font-bold rounded-md border border-slate-200">
+                    V3.0
+                </span>
+            </h1>
+        </div>
+        <div class="hidden md:flex items-center space-x-6 text-sm font-medium text-slate-600">
+            <a href="https://github.com" target="_blank" class="hover:text-blue-600 transition-colors">GitHub</a>
+            <a href="swagger.json" target="_blank" class="hover:text-blue-600 transition-colors">API Docs</a>
         </div>
     </nav>
 
-    <div class="flex max-w-[90rem] mx-auto pt-16">
-        <!-- Sidebar -->
-        <aside class="w-72 fixed h-[calc(100vh-4rem)] overflow-y-auto bg-slate-50 border-r border-slate-200 p-6 hidden lg:block scroll-smooth">
-            <h3 class="font-bold text-slate-400 uppercase text-[10px] tracking-widest mb-4 flex items-center">
-                <svg class="w-3 h-3 mr-1.5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h7"></path></svg>
-                Table of Contents
-            </h3>
-            <ul class="space-y-1 text-sm font-medium text-slate-600">
-                <li><a href="index.html" class="flex items-center px-3 py-2 rounded-lg transition-all duration-200 {{#if (eq activePage 'index')}}bg-white shadow-sm ring-1 ring-slate-200 text-indigo-700{{else}}hover:bg-slate-200/50 hover:text-slate-900{{/if}}">Home & Quick Start</a></li>
-                
-                <li class="pt-5 pb-1 px-3"><span class="font-bold text-slate-900 uppercase text-[10px] tracking-widest">1. Core Concepts</span></li>
-                <li><a href="gdl.html" class="flex items-center px-3 py-2 rounded-lg transition-all duration-200 {{#if (eq activePage 'gdl')}}bg-white shadow-sm ring-1 ring-slate-200 text-indigo-700{{else}}hover:bg-slate-200/50 hover:text-slate-900{{/if}}">GDL & Framework</a></li>
-                <li><a href="cli.html" class="flex items-center px-3 py-2 rounded-lg transition-all duration-200 {{#if (eq activePage 'cli')}}bg-white shadow-sm ring-1 ring-slate-200 text-indigo-700{{else}}hover:bg-slate-200/50 hover:text-slate-900{{/if}}">CLI & Code Injection</a></li>
-                
-                <li class="pt-5 pb-1 px-3"><span class="font-bold text-slate-900 uppercase text-[10px] tracking-widest">2. API Endpoints</span></li>
-                <li><a href="rest.html" class="flex items-center px-3 py-2 rounded-lg transition-all duration-200 {{#if (eq activePage 'rest')}}bg-white shadow-sm ring-1 ring-slate-200 text-indigo-700{{else}}hover:bg-slate-200/50 hover:text-slate-900{{/if}}">REST & Generic Search</a></li>
-                <li><a href="graphql.html" class="flex items-center px-3 py-2 rounded-lg transition-all duration-200 {{#if (eq activePage 'graphql')}}bg-white shadow-sm ring-1 ring-slate-200 text-indigo-700{{else}}hover:bg-slate-200/50 hover:text-slate-900{{/if}}">GraphQL Integration</a></li>
-                <li><a href="grpc.html" class="flex items-center px-3 py-2 rounded-lg transition-all duration-200 {{#if (eq activePage 'grpc')}}bg-white shadow-sm ring-1 ring-slate-200 text-indigo-700{{else}}hover:bg-slate-200/50 hover:text-slate-900{{/if}}">Secured gRPC (Kratos)</a></li>
-                
-                <li class="pt-5 pb-1 px-3"><span class="font-bold text-slate-900 uppercase text-[10px] tracking-widest">3. Real-Time & Audit</span></li>
-                <li><a href="realtime.html" class="flex items-center px-3 py-2 rounded-lg transition-all duration-200 {{#if (eq activePage 'realtime')}}bg-white shadow-sm ring-1 ring-slate-200 text-indigo-700{{else}}hover:bg-slate-200/50 hover:text-slate-900{{/if}}">WebSockets & MQTT</a></li>
-                <li><a href="audit.html" class="flex items-center px-3 py-2 rounded-lg transition-all duration-200 {{#if (eq activePage 'audit')}}bg-white shadow-sm ring-1 ring-slate-200 text-indigo-700{{else}}hover:bg-slate-200/50 hover:text-slate-900{{/if}}">Audit & Metering</a></li>
-                
-                <li class="pt-5 pb-1 px-3"><span class="font-bold text-slate-900 uppercase text-[10px] tracking-widest">4. Infrastructure</span></li>
-                <li><a href="security.html" class="flex items-center px-3 py-2 rounded-lg transition-all duration-200 {{#if (eq activePage 'security')}}bg-white shadow-sm ring-1 ring-slate-200 text-indigo-700{{else}}hover:bg-slate-200/50 hover:text-slate-900{{/if}}">Security & Resilience</a></li>
-                <li><a href="observability.html" class="flex items-center px-3 py-2 rounded-lg transition-all duration-200 {{#if (eq activePage 'observability')}}bg-white shadow-sm ring-1 ring-slate-200 text-indigo-700{{else}}hover:bg-slate-200/50 hover:text-slate-900{{/if}}">Observability</a></li>
-                
-                <li class="pt-5 pb-1 px-3"><span class="font-bold text-slate-900 uppercase text-[10px] tracking-widest">5. References</span></li>
-                <li><a href="integrations.html" class="flex items-center px-3 py-2 rounded-lg transition-all duration-200 {{#if (eq activePage 'integrations')}}bg-white shadow-sm ring-1 ring-slate-200 text-indigo-700{{else}}hover:bg-slate-200/50 hover:text-slate-900{{/if}}">Client Integrations</a></li>
+    <!-- Sidebar Navigation -->
+    <aside id="sidebar" class="py-6 px-2">
+        <div class="mb-8 px-4">
+            <h3 class="text-[11px] font-bold text-slate-400 uppercase tracking-[0.2em] mb-4">Documentation</h3>
+            <ul class="space-y-1">
+                <li><a href="index.html" class="block px-4 py-2 rounded-lg text-sm transition-all {{#if (eq activePage 'index')}}sidebar-link-active{{else}}text-slate-600 hover:bg-slate-100 hover:text-slate-900{{/if}}">Introduction</a></li>
+                <li><a href="legend.html" class="block px-4 py-2 rounded-lg text-sm transition-all {{#if (eq activePage 'legend')}}sidebar-link-active{{else}}text-slate-600 hover:bg-slate-100 hover:text-slate-900{{/if}}">🦆 The Legend</a></li>
             </ul>
-        </aside>
-
-        <main class="flex-1 lg:ml-72 p-6 md:p-10 max-w-4xl xl:max-w-5xl">
-            <!-- White Content Card -->
-            <div class="bg-white rounded-2xl shadow-sm border border-slate-200 p-8 md:p-12 mb-10 relative overflow-hidden">
-                <!-- Background Decoration -->
-                <div class="absolute top-0 right-0 w-64 h-64 bg-slate-50 rounded-bl-full -z-0"></div>
-                
-                <!-- Content injected here (raised z-index) -->
-                <div class="relative z-10">
-                    {{{body}}}
-                </div>
+        </div>
+
+        <div class="mb-8 px-4">
+            <h3 class="text-[11px] font-bold text-slate-400 uppercase tracking-[0.2em] mb-4">GDL Language</h3>
+            <ul class="space-y-1 border-l-2 border-indigo-100 ml-2">
+                <li><a href="gdl.html" class="block px-4 py-2 rounded-r-lg text-sm transition-all {{#if (eq activePage 'gdl')}}sidebar-link-active{{else}}text-slate-600 hover:bg-slate-100 hover:text-slate-900{{/if}}">⚡ Getting Started</a></li>
+                <li><a href="gdl-entities.html" class="block px-4 py-2 rounded-r-lg text-sm transition-all {{#if (eq activePage 'gdl-entities')}}sidebar-link-active{{else}}text-slate-600 hover:bg-slate-100 hover:text-slate-900{{/if}}">💎 Entities & Fields</a></li>
+                <li><a href="gdl-relationships.html" class="block px-4 py-2 rounded-r-lg text-sm transition-all {{#if (eq activePage 'gdl-relationships')}}sidebar-link-active{{else}}text-slate-600 hover:bg-slate-100 hover:text-slate-900{{/if}}">🧬 Relationships</a></li>
+                <li><a href="gdl-annotations.html" class="block px-4 py-2 rounded-r-lg text-sm transition-all {{#if (eq activePage 'gdl-annotations')}}sidebar-link-active{{else}}text-slate-600 hover:bg-slate-100 hover:text-slate-900{{/if}}">🎯 Power-up Annotations</a></li>
+                <li><a href="gdl-advanced.html" class="block px-4 py-2 rounded-r-lg text-sm transition-all {{#if (eq activePage 'gdl-advanced')}}sidebar-link-active{{else}}text-slate-600 hover:bg-slate-100 hover:text-slate-900{{/if}}">🔮 Advanced Topics</a></li>
+            </ul>
+        </div>
+
+        <div class="mb-8 px-4">
+            <div class="flex items-center justify-between mb-4">
+                <h3 class="text-[11px] font-bold text-slate-400 uppercase tracking-[0.2em]">Generation & CLI</h3>
+                <span class="px-2 py-0.5 bg-indigo-600 text-white text-[9px] font-black rounded-lg animate-pulse shadow-lg shadow-indigo-200">NEW</span>
             </div>
-            
-            <footer class="mt-8 text-center text-slate-400 text-sm mb-8 flex justify-center items-center space-x-2">
-                <span>Generated with</span>
-                <span class="text-lg">🦆</span>
-                <span>by <strong>GO-DUCK CLI</strong></span>
+            <ul class="space-y-1">
+                <li><a href="wizard.html" class="block px-4 py-2 rounded-lg text-sm transition-all {{#if (eq activePage 'wizard')}}sidebar-link-active font-black bg-indigo-50{{else}}text-slate-600 font-bold hover:bg-slate-100 hover:text-slate-900{{/if}}">✨ Config Wizard</a></li>
+                <li><a href="cli.html" class="block px-4 py-2 rounded-lg text-sm transition-all {{#if (eq activePage 'cli')}}sidebar-link-active{{else}}text-slate-600 hover:bg-slate-100 hover:text-slate-900{{/if}}">CLI Reference</a></li>
+                <li><a href="configuration.html" class="block px-4 py-2 rounded-lg text-sm transition-all {{#if (eq activePage 'configuration')}}sidebar-link-active{{else}}text-slate-600 hover:bg-slate-100 hover:text-slate-900{{/if}}">⚙️ Configuration</a></li>
+            </ul>
+        </div>
+
+        <div class="mb-8 px-4">
+            <h3 class="text-[11px] font-bold text-slate-400 uppercase tracking-[0.2em] mb-4">API Features</h3>
+            <ul class="space-y-1">
+                <li><a href="rest.html" class="block px-4 py-2 rounded-lg text-sm transition-all {{#if (eq activePage 'rest')}}sidebar-link-active{{else}}text-slate-600 hover:bg-slate-100 hover:text-slate-900{{/if}}">REST & Search</a></li>
+                <li><a href="graphql.html" class="block px-4 py-2 rounded-lg text-sm transition-all {{#if (eq activePage 'graphql')}}sidebar-link-active{{else}}text-slate-600 hover:bg-slate-100 hover:text-slate-900{{/if}}">GraphQL Integration</a></li>
+                <li><a href="multitenancy.html" class="block px-4 py-2 rounded-lg text-sm transition-all {{#if (eq activePage 'multitenancy')}}sidebar-link-active{{else}}text-slate-600 hover:bg-slate-100 hover:text-slate-900{{/if}}">Multi-Tenancy</a></li>
+                <li><a href="federation.html" class="block px-4 py-2 rounded-lg text-sm transition-all {{#if (eq activePage 'federation')}}sidebar-link-active{{else}}text-slate-600 hover:bg-slate-100 hover:text-slate-900{{/if}}">Federated Architecture</a></li>
+                <li><a href="hybrid-store.html" class="block px-4 py-2 rounded-lg text-sm transition-all {{#if (eq activePage 'hybrid-store')}}sidebar-link-active{{else}}text-slate-600 hover:bg-slate-100 hover:text-slate-900{{/if}}">🍀 Hybrid-Store</a></li>
+                <li><a href="grpc.html" class="block px-4 py-2 rounded-lg text-sm transition-all {{#if (eq activePage 'grpc')}}sidebar-link-active{{else}}text-slate-600 hover:bg-slate-100 hover:text-slate-900{{/if}}">gRPC Service</a></li>
+            </ul>
+        </div>
+
+        <div class="mb-8 px-4">
+            <h3 class="text-[11px] font-bold text-slate-400 uppercase tracking-[0.2em] mb-4">Monitoring</h3>
+            <ul class="space-y-1">
+                <li><a href="realtime.html" class="block px-4 py-2 rounded-lg text-sm transition-all {{#if (eq activePage 'realtime')}}sidebar-link-active{{else}}text-slate-600 hover:bg-slate-100 hover:text-slate-900{{/if}}">WebSockets</a></li>
+                <li><a href="audit.html" class="block px-4 py-2 rounded-lg text-sm transition-all {{#if (eq activePage 'audit')}}sidebar-link-active{{else}}text-slate-600 hover:bg-slate-100 hover:text-slate-900{{/if}}">Audit Logs</a></li>
+                <li><a href="observability.html" class="block px-4 py-2 rounded-lg text-sm transition-all {{#if (eq activePage 'observability')}}sidebar-link-active{{else}}text-slate-600 hover:bg-slate-100 hover:text-slate-900{{/if}}">Observability</a></li>
+            </ul>
+        </div>
+
+        <div class="mb-8 px-4">
+            <h3 class="text-[11px] font-bold text-slate-400 uppercase tracking-[0.2em] mb-4">Infrastructure</h3>
+            <ul class="space-y-1">
+                <li><a href="security.html" class="block px-4 py-2 rounded-lg text-sm transition-all {{#if (eq activePage 'security')}}sidebar-link-active{{else}}text-slate-600 hover:bg-slate-100 hover:text-slate-900{{/if}}">Security</a></li>
+                <li><a href="redis.html" class="block px-4 py-2 rounded-lg text-sm transition-all {{#if (eq activePage 'redis')}}sidebar-link-active{{else}}text-slate-600 hover:bg-slate-100 hover:text-slate-900{{/if}}">Redis</a></li>
+                <li><a href="keycloak.html" class="block px-4 py-2 rounded-lg text-sm transition-all {{#if (eq activePage 'keycloak')}}sidebar-link-active{{else}}text-slate-600 hover:bg-slate-100 hover:text-slate-900{{/if}}">Keycloak</a></li>
+                <li><a href="serverless.html" class="block px-4 py-2 rounded-lg text-sm transition-all {{#if (eq activePage 'serverless')}}sidebar-link-active{{else}}text-slate-600 hover:bg-slate-100 hover:text-slate-900{{/if}}">🚀 Serverless</a></li>
+            </ul>
+        </div>
+    </aside>
+
+    <!-- Main Content Wrapper -->
+    <div id="content-wrapper">
+        <main class="w-full px-6 md:px-12 py-10">
+            <article class="max-w-none prose prose-slate prose-blue">
+                {{{body}}}
+            </article>
+
+            <!-- Consolidated Elite Footer -->
+            <footer class="mt-24 py-12 border-t border-slate-100 flex flex-col md:flex-row justify-between items-center gap-12 text-slate-400 text-[10px] font-bold uppercase tracking-[0.3em]">
+                <div class="flex flex-col items-center md:items-start gap-4">
+                    <p>© 2024-2026 GO-DUCK ELITE ECOSYSTEM. ALL RIGHTS RESERVED.</p>
+                    <div class="flex gap-10">
+                        <a href="security.html" class="hover:text-indigo-600 transition-colors">Digital Defense</a>
+                        <a href="audit.html" class="hover:text-indigo-600 transition-colors">Privacy Shield</a>
+                        <a href="configuration.html" class="hover:text-indigo-600 transition-colors">Architecture Audit</a>
+                    </div>
+                </div>
+                <div class="flex items-center gap-6">
+                    <div class="flex flex-col items-end gap-1">
+                        <span class="text-[9px] text-slate-300 uppercase">System Architecture</span>
+                        <span class="text-slate-400 font-black">INDUSTRIAL GRADE VR.1</span>
+                    </div>
+                    <span class="text-4xl filter grayscale opacity-20 transform hover:grayscale-0 hover:opacity-100 transition-all duration-700 cursor-alias">🦆</span>
+                </div>
             </footer>
         </main>
     </div>
+
     <!-- Lightbox Overlay -->
-    <div id="lightbox" class="fixed inset-0 bg-slate-900/90 backdrop-blur-sm z-[100] hidden flex items-center justify-center p-4 md:p-10 cursor-zoom-out" onclick="this.classList.add('hidden')">
-        <div class="relative max-w-5xl w-full h-full flex items-center justify-center">
-            <img id="lightbox-img" src="" alt="Enlarged View" class="max-w-full max-h-full object-contain rounded-xl shadow-2xl transition-all duration-300">
-            <button class="absolute top-0 right-0 m-4 text-white hover:text-indigo-300 transition-colors">
-                <svg class="w-8 h-8" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path></svg>
+    <div id="lightbox" class="fixed inset-0 bg-slate-900/95 backdrop-blur-md z-[100] hidden flex items-center justify-center p-4 md:p-10 cursor-zoom-out transition-all duration-300 opacity-0" onclick="closeLightbox()">
+        <div class="relative max-w-6xl w-full h-full flex flex-col items-center justify-center transform scale-95 transition-transform duration-300" id="lightbox-content">
+            <img id="lightbox-img" src="" alt="Enlarged View" class="max-w-full max-h-full object-contain rounded-2xl shadow-2xl ring-1 ring-white/10">
+            <button class="absolute top-4 right-4 m-4 text-white/70 hover:text-white bg-black/20 hover:bg-black/40 rounded-full p-2 transition-all p-3" onclick="closeLightbox(event)">
+                <svg class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path></svg>
             </button>
         </div>
     </div>
 
     <script>
+        const mobileMenuBtn = document.getElementById('mobile-menu-btn');
+        const sidebar = document.getElementById('sidebar');
+
+        if (mobileMenuBtn && sidebar) {
+            mobileMenuBtn.addEventListener('click', () => {
+                sidebar.classList.toggle('open');
+            });
+        }
+
         function openLightbox(src) {
             const lb = document.getElementById('lightbox');
+            const content = document.getElementById('lightbox-content');
             const img = document.getElementById('lightbox-img');
             img.src = src;
             lb.classList.remove('hidden');
+            void lb.offsetWidth;
+            lb.classList.remove('opacity-0');
+            lb.classList.add('opacity-100');
+            content.classList.remove('scale-95');
+            content.classList.add('scale-100');
+        }
+        
+        function closeLightbox(e) {
+            if (e) e.stopPropagation();
+            const lb = document.getElementById('lightbox');
+            const content = document.getElementById('lightbox-content');
+            lb.classList.remove('opacity-100');
+            lb.classList.add('opacity-0');
+            content.classList.remove('scale-100');
+            content.classList.add('scale-95');
+            setTimeout(() => {
+                lb.classList.add('hidden');
+            }, 300);
         }
     </script>
 </body>