shokupan 0.10.4 → 0.11.0

package/dist/plugins/application/dashboard/static/styles.css

@@ -14,7 +14,7 @@ html {
 body {
     display: flex;
     flex-direction: column;
-    font-family: 'Inter', -apple-system, BlinkMacSystemFont, sans-serif;
+    font-family: var(--shokupan-font);
     background-color: var(--bg-primary);
     color: var(--text-primary);
     height: 100vh;
@@ -26,7 +26,6 @@ header {
     background-color: var(--bg-header);
     padding: 0 1rem;
     display: flex;
-    justify-content: space-between;
     align-items: center;
 }
 
@@ -56,6 +55,15 @@ select {
     flex-direction: column;
     align-items: center;
     overflow: hidden;
+    width: 100%;
+}
+
+.contents {
+    width: 100%;
+    display: flex;
+    height: 100%;
+    overflow-y: auto;
+    justify-content: center;
 }
 
 .metrics-grid {
@@ -116,7 +124,6 @@ select {
     border: 1px solid var(--card-border);
     border-radius: 1rem;
     padding: 1.5rem;
-    margin-bottom: 2rem;
     overflow: hidden;
 }
 
@@ -125,14 +132,13 @@ select {
     display: flex;
     gap: 1rem;
     border-bottom: 1px solid var(--card-border);
-    margin-bottom: 2rem;
 }
 
 .tab-btn {
     background: none;
     border: none;
     color: var(--text-secondary);
-    padding: 1rem;
+    padding: .5rem;
     cursor: pointer;
     font-size: 1rem;
     border-bottom: 2px solid transparent;
@@ -154,31 +160,197 @@ select {
 
 .tab-content {
     display: none;
-    flex-direction: column;
     flex: 1;
-    overflow: auto;
-    width: -webkit-fill-available;
-    /* width: 1200px; */
-    max-width: 1200px;
-    margin: 0 2rem;
+    flex-direction: column;
+    width: 100%
 }
 
 .tab-content.active {
-    display: flex;
+    display: block;
 }
 
 
 /* Graph */
 #cy {
-    width: 100%;
+    width: calc(100% - 4rem);
     height: 600px;
     background-color: var(--bg-secondary);
-    border-radius: 1rem;
+    border-radius: 4px;
     border: 1px solid var(--card-border);
+    overflow: hidden
 }
 
 .card-container {
     display: grid;
     gap: 1rem;
     grid-template-columns: 1fr;
+}
+
+#tab-overview {
+    /* width: 100%; */
+    /* max-width: 1200px; */
+    max-width: 900px;
+    margin: 2rem
+}
+
+.button-group {
+    display: inline-flex;
+    background: var(--bg-secondary);
+    padding: 4px;
+    border-radius: 8px;
+    border: 1px solid var(--card-border);
+}
+
+.view-btn {
+    background: transparent;
+    border: none;
+    color: var(--text-secondary);
+    padding: 6px 12px;
+    border-radius: 6px;
+    font-size: 0.9rem;
+    cursor: pointer;
+    transition: all 0.2s;
+}
+
+.view-btn:hover {
+    color: var(--text-primary);
+}
+
+.view-btn.active {
+    background: var(--bg-primary);
+    color: var(--accent);
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+    font-weight: 500;
+}
+
+.app-view {
+    display: none;
+    flex: 1;
+    width: 100%;
+}
+
+.app-view.active {
+    display: flex;
+    flex-direction: column;
+}
+
+.traffic-view {
+    display: none;
+    flex: 1;
+    width: 100%;
+}
+
+.traffic-view.active {
+    display: flex;
+    flex-direction: column;
+}
+
+.btn-action {
+    background: var(--bg-primary);
+    border: 1px solid var(--card-border);
+    color: var(--text-primary);
+    padding: 4px 8px;
+    border-radius: 4px;
+    font-size: 0.8rem;
+    cursor: pointer;
+    transition: all 0.2s;
+    display: flex;
+    align-items: center;
+    gap: 4px;
+}
+
+.btn-action:hover {
+    background: var(--bg-secondary);
+    border-color: var(--accent);
+}
+
+/* Network Tab Styles */
+
+/* Tabulator Overrides for DevTools look */
+.tabulator {
+    border: none !important;
+    background-color: var(--bg-secondary) !important;
+}
+
+.tabulator-header {
+    background-color: var(--bg-header) !important;
+    border-bottom: 1px solid var(--border-color) !important;
+    color: var(--text-secondary) !important;
+    font-weight: 500 !important;
+}
+
+.tabulator-col {
+    background-color: transparent !important;
+    border-right: 1px solid var(--border-color) !important;
+}
+
+.tabulator-row {
+    background-color: var(--bg-secondary) !important;
+    border-bottom: 1px solid var(--border-color) !important;
+    color: var(--text-primary) !important;
+}
+
+.tabulator-row:hover {
+    background-color: var(--bg-primary) !important;
+    cursor: pointer;
+}
+
+.tabulator-row.tabulator-selected {
+    background-color: #2e3440 !important;
+    color: #fff !important;
+}
+
+/* Tabs */
+.tab-item {
+    transition: all 0.2s;
+}
+
+.tab-item:hover {
+    background-color: rgba(255, 255, 255, 0.05);
+}
+
+.tab-item.active {
+    background-color: rgba(59, 130, 246, 0.1);
+}
+
+/* Details Panel */
+details>summary {
+    list-style: none;
+}
+
+details>summary::-webkit-details-marker {
+    display: none;
+}
+
+details>summary::before {
+    content: '▶';
+    font-size: 0.8em;
+    margin-right: 6px;
+    display: inline-block;
+    transition: transform 0.2s;
+}
+
+details[open]>summary::before {
+    transform: rotate(90deg);
+}
+
+/* Slightly lighter than bg-secondary */
+/* border-left: 2px solid var(--accent) !important; */
+/* Slightly lighter than bg-secondary */
+
+/* Filter Bar */
+#network-filter-bar input:focus,
+#network-filter-bar select:focus {
+    border-color: var(--accent);
+    outline: none;
+}
+
+#tab-network {
+    height: 100%;
+    overflow: hidden;
+    flex-direction: column;
+}
+
+#tab-network.active {
+    display: flex !important;
 }

package/dist/plugins/application/dashboard/static/tabs.js

@@ -14,20 +14,55 @@ function switchTab(tabId) {
     if (tabId === 'overview') {
         if (typeof fetchTopStats === 'function') fetchTopStats();
     }
-    else if (tabId === 'graph') {
-        initGraph();
+    else if (tabId === 'application') {
+        const activeView = document.querySelector('.app-view.active');
+        if (!activeView || activeView.id === 'app-view-registry') {
+            switchApplicationView('registry');
+        } else {
+            switchApplicationView('graph');
+        }
     }
-    else if (tabId === 'requests') {
+    else if (tabId === 'network') {
         if (typeof fetchRequests === 'function') fetchRequests();
+        // Redraw table if it exists to fix layout issues when unhiding
+        setTimeout(() => {
+            if (window.requestsTable) window.requestsTable.redraw();
+        }, 50);
     }
-    else if (tabId === 'failures') {
-        fetchFailures();
-    }
-    else if (tabId === 'middleware') {
-        fetchMiddleware();
+}
+
+
+function switchApplicationView(viewId) {
+    console.log('Switching application view to:', viewId);
+
+    // Update buttons
+    const container = document.getElementById('tab-application');
+    if (!container) return;
+
+    container.querySelectorAll('.view-btn').forEach(btn => btn.classList.remove('active'));
+    // Find button
+    const btn = Array.from(container.querySelectorAll('.view-btn')).find(b => b.getAttribute('onclick') === `switchApplicationView('${viewId}')`);
+    if (btn) btn.classList.add('active');
+
+    // Update content
+    container.querySelectorAll('.app-view').forEach(view => {
+        view.classList.remove('active');
+        view.style.display = 'none';
+    });
+
+    const activeView = document.getElementById('app-view-' + viewId);
+    if (activeView) {
+        activeView.classList.add('active');
+        activeView.style.display = 'block';
     }
-    else if (tabId === 'registry') {
+
+    if (viewId === 'registry') {
         if (typeof fetchRegistry === 'function') fetchRegistry();
+    } else if (viewId === 'graph') {
+        // Build graph if needed
+        setTimeout(() => {
+            if (typeof initGraph === 'function') initGraph();
+        }, 50);
     }
 }
 

package/dist/plugins/application/dashboard/static/theme.css

@@ -13,8 +13,8 @@
     --palette-dark-header: rgb(39, 27, 19);
     /* Proofing Drawer */
 
-    /* Universal defaults (tokens) */
-    --shokupan-font: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
+    --shokupan-font: "Vend Sans", 'Open Sans', 'Helvetica Neue', sans-serif;
+    --shokupan-font-mono: "Google Sans Code", monospace;
 
     /* Theme Variables - Enforced Dark Mode */
     --bg-primary: var(--palette-dark-bg);
@@ -42,6 +42,11 @@
     --button-text: #1A1614;
 }
 
+* {
+    box-sizing: border-box;
+    font-optical-sizing: auto;
+}
+
 ::-webkit-scrollbar {
     width: 8px;
     height: 8px;

package/dist/plugins/application/openapi/analyzer.impl.d.ts

@@ -14,6 +14,7 @@ export interface RouteInfo {
     };
     responseType?: string;
     responseSchema?: any;
+    hasUnknownFields?: boolean;
     summary?: string;
     description?: string;
     tags?: string[];
@@ -33,7 +34,7 @@ export interface RouteInfo {
         highlights?: {
             startLine: number;
             endLine: number;
-            type: 'emit' | 'return-success' | 'return-warning';
+            type: 'emit' | 'return-success' | 'return-warning' | 'dynamic-path';
         }[];
     };
 }
@@ -56,6 +57,7 @@ export interface ApplicationInstance {
     controllerPrefix?: string;
     routes: RouteInfo[];
     mounted: MountInfo[];
+    middleware: MiddlewareInfo[];
 }
 interface MountInfo {
     prefix: string;
@@ -68,6 +70,31 @@ interface MountInfo {
         endLine: number;
     };
 }
+/**
+ * Middleware information extracted from AST
+ */
+export interface MiddlewareInfo {
+    name: string;
+    file: string;
+    startLine: number;
+    endLine: number;
+    handlerSource?: string;
+    responseTypes?: Record<string, any>;
+    headers?: string[];
+    scope: 'global' | 'router' | 'route';
+    sourceContext?: {
+        file: string;
+        startLine: number;
+        endLine: number;
+        snippet?: string;
+        snippetStartLine?: number;
+        highlights?: {
+            startLine: number;
+            endLine: number;
+            type: 'emit' | 'return-success' | 'return-warning';
+        }[];
+    };
+}
 /**
  * Main analyzer class
  */
@@ -77,6 +104,7 @@ export declare class OpenAPIAnalyzer {
     private applications;
     private program?;
     private entrypoint?;
+    private imports;
     constructor(rootDir: string, entrypoint?: string);
     /**
      * Main analysis entry point
@@ -99,6 +127,10 @@ export declare class OpenAPIAnalyzer {
      * Process source maps to reconstruct TypeScript
      */
     private processSourceMaps;
+    /**
+     * Collect all imports from source files for later resolution
+     */
+    private collectImports;
     /**
      * Parse TypeScript files and create AST
      */
@@ -123,6 +155,10 @@ export declare class OpenAPIAnalyzer {
      * Extract routes from a specific file
      */
     private extractRoutesFromFile;
+    /**
+     * Resolve string value from expression (literals, concatenation, templates, constants)
+     */
+    private resolveStringValue;
     /**
      * Extract route information from a route call (e.g., app.get('/path', handler))
      */
@@ -135,6 +171,14 @@ export declare class OpenAPIAnalyzer {
      * Convert an Expression node to an OpenAPI schema (best effort)
      */
     private convertExpressionToSchema;
+    /**
+     * Deduplicate schemas by comparing their JSON representations
+     */
+    private deduplicateSchemas;
+    /**
+     * Check if a schema contains fields with unknown types
+     */
+    private hasUnknownFields;
     /**
      * Check if an expression is a call to ctx.body()
      */
@@ -143,10 +187,26 @@ export declare class OpenAPIAnalyzer {
      * Convert a TypeScript TypeNode to an OpenAPI schema
      */
     private convertTypeNodeToSchema;
+    /**
+     * Convert a TypeScript Type (from type checker) to an OpenAPI schema
+     */
+    private convertTypeToSchema;
     /**
      * Extract mount information from mount call
      */
     private extractMountFromCall;
+    /**
+     * Extract middleware information from .use() call
+     */
+    private extractMiddlewareFromCall;
+    /**
+     * Analyze middleware function to extract response types and headers
+     */
+    private analyzeMiddleware;
+    /**
+     * Resolve an imported middleware identifier and analyze its definition
+     */
+    private resolveImportedMiddlewareDefinition;
     /**
      * Check if a reference is to an external dependency
      */

package/dist/plugins/application/openapi/openapi.d.ts

@@ -1,5 +1,8 @@
 import { ShokupanRouter } from '../../../router';
 import { OpenAPIOptions } from '../../../util/types';
+/**
+ * Gets deduped AST routes if available.
+ */
 /**
  * Statically generate an OpenAPI spec from a ShokupanRouter instance.
  *

package/dist/plugins/application/shared/ast-utils.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Gets deduped AST routes if available.
+ */
+export declare function getAstRoutes(applications: any[], options?: {
+    includePrefix?: boolean;
+    pathTransform?: (p: string) => string;
+}): Promise<any[]>;