@grafema/core 0.1.0-alpha.5 → 0.1.1-alpha

package/src/plugins/analysis/DatabaseAnalyzer.ts

@@ -11,6 +11,7 @@ import type { NodePath } from '@babel/traverse';
 import { Plugin, createSuccessResult, createErrorResult } from '../Plugin.js';
 import type { PluginContext, PluginResult, PluginMetadata } from '../Plugin.js';
 import type { NodeRecord } from '@grafema/types';
+import { getLine } from './ast/utils/location.js';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const traverse = (traverseModule as any).default || traverseModule;
@@ -55,12 +56,14 @@ export class DatabaseAnalyzer extends Plugin {
   }
 
   async execute(context: PluginContext): Promise<PluginResult> {
+    const logger = this.log(context);
+
     try {
       const { graph } = context;
 
       // Получаем все MODULE ноды
       const modules = await this.getModules(graph);
-      console.log(`[DatabaseAnalyzer] Processing ${modules.length} modules...`);
+      logger.info('Processing modules', { count: modules.length });
 
       // Получаем все FUNCTION ноды для связывания
       const functions = await this.getFunctions(graph);
@@ -82,13 +85,16 @@ export class DatabaseAnalyzer extends Plugin {
         if ((i + 1) % 20 === 0 || i === modules.length - 1) {
           const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
           const avgTime = ((Date.now() - startTime) / (i + 1)).toFixed(0);
-          console.log(
-            `[DatabaseAnalyzer] Progress: ${i + 1}/${modules.length} (${elapsed}s, avg ${avgTime}ms/module)`
-          );
+          logger.debug('Progress', {
+            current: i + 1,
+            total: modules.length,
+            elapsed: `${elapsed}s`,
+            avgTime: `${avgTime}ms/module`
+          });
         }
       }
 
-      console.log(`[DatabaseAnalyzer] Created ${queriesCreated} queries, ${tablesCreated} tables`);
+      logger.info('Analysis complete', { queriesCreated, tablesCreated });
 
       return createSuccessResult(
         {
@@ -101,7 +107,7 @@ export class DatabaseAnalyzer extends Plugin {
         }
       );
     } catch (error) {
-      console.error(`[DatabaseAnalyzer] Error:`, error);
+      logger.error('Analysis failed', { error });
       return createErrorResult(error as Error);
     }
   }
@@ -218,7 +224,7 @@ export class DatabaseAnalyzer extends Plugin {
                   object: objectName,
                   method: methodName,
                   file: module.file!,
-                  line: node.loc!.start.line
+                  line: getLine(node)
                 });
               }
             }
@@ -292,7 +298,7 @@ export class DatabaseAnalyzer extends Plugin {
         }
       }
     } catch (error) {
-      console.error(`[DatabaseAnalyzer] Error analyzing ${module.file}:`, (error as Error).message);
+      // Silent - per-module errors shouldn't spam logs
     }
 
     return {

package/src/plugins/analysis/ExpressAnalyzer.ts

@@ -6,12 +6,14 @@
 import { readFileSync } from 'fs';
 import { parse, ParserPlugin } from '@babel/parser';
 import traverseModule from '@babel/traverse';
-import { dirname, resolve } from 'path';
+import { dirname, resolve, relative } from 'path';
 import type { CallExpression, ImportDeclaration, StringLiteral, TemplateLiteral, Identifier, MemberExpression } from '@babel/types';
 import type { NodePath } from '@babel/traverse';
 import { Plugin, createSuccessResult, createErrorResult } from '../Plugin.js';
 import type { PluginContext, PluginResult, PluginMetadata } from '../Plugin.js';
 import type { NodeRecord } from '@grafema/types';
+import { NetworkRequestNode } from '../../core/nodes/NetworkRequestNode.js';
+import { getLine } from './ast/utils/location.js';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const traverse = (traverseModule as any).default || traverseModule;
@@ -77,17 +79,14 @@ export class ExpressAnalyzer extends Plugin {
   }
 
   async execute(context: PluginContext): Promise<PluginResult> {
+    const logger = this.log(context);
+
     try {
       const { graph } = context;
 
-      // Создаём net:request ноду (дедупликация в GraphBackend)
-      const networkId = 'net:request#__network__';
-      await graph.addNode({
-        id: networkId,
-        type: 'net:request',
-        name: '__network__',
-        description: 'External HTTP network'
-      });
+      // Create net:request singleton (GraphBackend handles deduplication)
+      const networkNode = NetworkRequestNode.create();
+      await graph.addNode(networkNode);
 
       // Получаем все MODULE ноды
       const modules = await this.getModules(graph);
@@ -98,13 +97,13 @@ export class ExpressAnalyzer extends Plugin {
 
       // Анализируем каждый модуль
       for (const module of modules) {
-        const result = await this.analyzeModule(module, graph, networkId);
+        const result = await this.analyzeModule(module, graph, networkNode.id);
         endpointsCreated += result.endpoints;
         mountPointsCreated += result.mountPoints;
         edgesCreated += result.edges;
       }
 
-      console.log(`[ExpressAnalyzer] Created ${endpointsCreated} endpoints, ${mountPointsCreated} mount points`);
+      logger.info('Analysis complete', { endpointsCreated, mountPointsCreated });
 
       return createSuccessResult(
         {
@@ -117,7 +116,7 @@ export class ExpressAnalyzer extends Plugin {
         }
       );
     } catch (error) {
-      console.error(`[ExpressAnalyzer] Error:`, error);
+      logger.error('Analysis failed', { error });
       return createErrorResult(error as Error);
     }
   }
@@ -169,7 +168,7 @@ export class ExpressAnalyzer extends Plugin {
           imports.push({
             source,
             specifiers,
-            line: importNode.loc!.start.line
+            line: getLine(importNode)
           });
         }
       });
@@ -204,13 +203,13 @@ export class ExpressAnalyzer extends Plugin {
               if (routePath) {
                 const method = methodName.toUpperCase();
                 endpoints.push({
-                  id: `http:route#${method}:${routePath}#${module.file}#${node.loc!.start.line}`,
+                  id: `http:route#${method}:${routePath}#${module.file}#${getLine(node)}`,
                   type: 'http:route',
                   method: method,
                   path: routePath,
                   localPath: routePath,
                   file: module.file!,
-                  line: node.loc!.start.line,
+                  line: getLine(node),
                   mountedOn: objectName
                 });
               }
@@ -281,13 +280,13 @@ export class ExpressAnalyzer extends Plugin {
               // Создаём mount point
               if ((targetFunction || targetVariable) && prefix) {
                 mountPoints.push({
-                  id: `express:mount#${prefix}#${module.file}#${node.loc!.start.line}`,
+                  id: `express:mount#${prefix}#${module.file}#${getLine(node)}`,
                   type: 'express:mount',
                   prefix: prefix,
                   targetFunction: targetFunction,
                   targetVariable: targetVariable,
                   file: module.file!,
-                  line: node.loc!.start.line,
+                  line: getLine(node),
                   mountedOn: objectName
                 });
               }
@@ -336,7 +335,7 @@ export class ExpressAnalyzer extends Plugin {
         edgesCreated += mountEdges;
       }
     } catch (error) {
-      console.error(`[ExpressAnalyzer] Error analyzing ${module.file}:`, (error as Error).message);
+      // Silent - per-module errors shouldn't spam logs
     }
 
     return {
@@ -382,7 +381,18 @@ export class ExpressAnalyzer extends Plugin {
 
     // Если нашли целевой модуль, создаем MOUNTS ребро
     if (targetModulePath) {
-      const targetModuleId = `${targetModulePath}:MODULE:${targetModulePath}:0`;
+      // Derive project root from module's absolute and relative paths
+      // module.file is absolute path, module.name is relative path
+      const moduleAbsPath = module.file!;
+      const moduleRelPath = module.name!;
+      // projectRoot = absolute path minus relative path suffix
+      const projectRoot = moduleAbsPath.endsWith(moduleRelPath)
+        ? moduleAbsPath.slice(0, moduleAbsPath.length - moduleRelPath.length)
+        : dirname(moduleAbsPath); // fallback
+
+      // Convert target absolute path to relative path for semantic ID
+      const targetRelativePath = relative(projectRoot, targetModulePath);
+      const targetModuleId = `${targetRelativePath}->global->MODULE->module`;
 
       // Проверяем что модуль существует в графе
       const targetModule = await graph.getNode(targetModuleId);

package/src/plugins/analysis/ExpressRouteAnalyzer.ts

@@ -16,6 +16,7 @@ import type { NodePath } from '@babel/traverse';
 import { Plugin, createSuccessResult, createErrorResult } from '../Plugin.js';
 import type { PluginContext, PluginResult, PluginMetadata } from '../Plugin.js';
 import type { NodeRecord } from '@grafema/types';
+import { getLine } from './ast/utils/location.js';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const traverse = (traverseModule as any).default || traverseModule;
@@ -75,12 +76,14 @@ export class ExpressRouteAnalyzer extends Plugin {
   }
 
   async execute(context: PluginContext): Promise<PluginResult> {
+    const logger = this.log(context);
+
     try {
       const { graph } = context;
 
       // Получаем все MODULE ноды
       const modules = await this.getModules(graph);
-      console.log(`[ExpressRouteAnalyzer] Processing ${modules.length} modules...`);
+      logger.info('Processing modules', { count: modules.length });
 
       let endpointsCreated = 0;
       let middlewareCreated = 0;
@@ -99,15 +102,16 @@ export class ExpressRouteAnalyzer extends Plugin {
         if ((i + 1) % 20 === 0 || i === modules.length - 1) {
           const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
           const avgTime = ((Date.now() - startTime) / (i + 1)).toFixed(0);
-          console.log(
-            `[ExpressRouteAnalyzer] Progress: ${i + 1}/${modules.length} (${elapsed}s, avg ${avgTime}ms/module)`
-          );
+          logger.debug('Progress', {
+            current: i + 1,
+            total: modules.length,
+            elapsed: `${elapsed}s`,
+            avgTime: `${avgTime}ms/module`
+          });
         }
       }
 
-      console.log(
-        `[ExpressRouteAnalyzer] Found ${endpointsCreated} endpoints, ${middlewareCreated} middleware`
-      );
+      logger.info('Analysis complete', { endpointsCreated, middlewareCreated });
 
       return createSuccessResult(
         {
@@ -117,7 +121,7 @@ export class ExpressRouteAnalyzer extends Plugin {
         { modulesAnalyzed: modules.length }
       );
     } catch (error) {
-      console.error(`[ExpressRouteAnalyzer] Error:`, error);
+      logger.error('Analysis failed', { error });
       return createErrorResult(error as Error);
     }
   }
@@ -216,7 +220,7 @@ export class ExpressRouteAnalyzer extends Plugin {
                   const middlewareHandlers = handlers.slice(0, -1);
 
                   // Создаём http:route
-                  const endpointId = `http:route#${method.toUpperCase()}:${routePath}#${module.file}#${node.loc!.start.line}`;
+                  const endpointId = `http:route#${method.toUpperCase()}:${routePath}#${module.file}#${getLine(node)}`;
 
                   endpoints.push({
                     id: endpointId,
@@ -224,11 +228,11 @@ export class ExpressRouteAnalyzer extends Plugin {
                     method: method.toUpperCase(),
                     path: routePath,
                     file: module.file!,
-                    line: node.loc!.start.line,
+                    line: getLine(node),
                     routerName: objectName,
                     handlerLine: (mainHandler as Node).loc
-                      ? (mainHandler as Node).loc!.start.line
-                      : node.loc!.start.line
+                      ? getLine(mainHandler as Node)
+                      : getLine(node)
                   });
 
                   // Обрабатываем middleware
@@ -249,18 +253,18 @@ export class ExpressRouteAnalyzer extends Plugin {
                       mwNode.type === 'ArrowFunctionExpression' ||
                       mwNode.type === 'FunctionExpression'
                     ) {
-                      middlewareName = `inline:${mwNode.loc!.start.line}`;
+                      middlewareName = `inline:${getLine(mwNode)}`;
                     }
 
                     if (middlewareName) {
-                      const middlewareId = `express:middleware#${middlewareName}#${module.file}#${mwNode.loc!.start.line}`;
+                      const middlewareId = `express:middleware#${middlewareName}#${module.file}#${getLine(mwNode)}`;
 
                       middlewares.push({
                         id: middlewareId,
                         type: 'express:middleware',
                         name: middlewareName,
                         file: module.file!,
-                        line: mwNode.loc ? mwNode.loc.start.line : node.loc!.start.line,
+                        line: mwNode.loc ? getLine(mwNode) : getLine(node),
                         endpointId: endpointId,
                         order: index // Порядок в цепочке
                       });
@@ -297,14 +301,14 @@ export class ExpressRouteAnalyzer extends Plugin {
                   }
 
                   if (middlewareName) {
-                    const middlewareId = `express:middleware#${middlewareName}#${module.file}#${node.loc!.start.line}`;
+                    const middlewareId = `express:middleware#${middlewareName}#${module.file}#${getLine(node)}`;
 
                     middlewares.push({
                       id: middlewareId,
                       type: 'express:middleware',
                       name: middlewareName,
                       file: module.file!,
-                      line: node.loc!.start.line,
+                      line: getLine(node),
                       mountPath: mountPath,
                       isGlobal: mountPath === '/' // Global middleware если нет path
                     });
@@ -399,10 +403,7 @@ export class ExpressRouteAnalyzer extends Plugin {
         }
       }
     } catch (error) {
-      console.error(
-        `[ExpressRouteAnalyzer] Error analyzing ${module.file}:`,
-        (error as Error).message
-      );
+      // Silent - per-module errors shouldn't spam logs
     }
 
     return {

package/src/plugins/analysis/FetchAnalyzer.ts

@@ -17,6 +17,8 @@ import type { NodePath } from '@babel/traverse';
 import { Plugin, createSuccessResult, createErrorResult } from '../Plugin.js';
 import type { PluginContext, PluginResult, PluginMetadata } from '../Plugin.js';
 import type { NodeRecord } from '@grafema/types';
+import { NetworkRequestNode } from '../../core/nodes/NetworkRequestNode.js';
+import { getLine } from './ast/utils/location.js';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const traverse = (traverseModule as any).default || traverseModule;
@@ -44,6 +46,8 @@ interface AnalysisResult {
 }
 
 export class FetchAnalyzer extends Plugin {
+  private networkNodeCreated = false;
+
   get metadata(): PluginMetadata {
     return {
       name: 'FetchAnalyzer',
@@ -58,12 +62,19 @@ export class FetchAnalyzer extends Plugin {
   }
 
   async execute(context: PluginContext): Promise<PluginResult> {
+    const logger = this.log(context);
+
     try {
       const { graph } = context;
 
+      // Create net:request singleton (GraphBackend handles deduplication)
+      const networkNode = NetworkRequestNode.create();
+      await graph.addNode(networkNode);
+      this.networkNodeCreated = true;
+
       // Получаем все модули
       const modules = await this.getModules(graph);
-      console.log(`[FetchAnalyzer] Processing ${modules.length} modules...`);
+      logger.info('Processing modules', { count: modules.length });
 
       let requestsCount = 0;
       let apisCount = 0;
@@ -71,7 +82,7 @@ export class FetchAnalyzer extends Plugin {
 
       for (let i = 0; i < modules.length; i++) {
         const module = modules[i];
-        const result = await this.analyzeModule(module, graph);
+        const result = await this.analyzeModule(module, graph, networkNode.id);
         requestsCount += result.requests;
         apisCount += result.apis;
 
@@ -79,33 +90,38 @@ export class FetchAnalyzer extends Plugin {
         if ((i + 1) % 20 === 0 || i === modules.length - 1) {
           const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
           const avgTime = ((Date.now() - startTime) / (i + 1)).toFixed(0);
-          console.log(
-            `[FetchAnalyzer] Progress: ${i + 1}/${modules.length} (${elapsed}s, avg ${avgTime}ms/module)`
-          );
+          logger.debug('Progress', {
+            current: i + 1,
+            total: modules.length,
+            elapsed: `${elapsed}s`,
+            avgTime: `${avgTime}ms/module`
+          });
         }
       }
 
-      console.log(`[FetchAnalyzer] Found ${requestsCount} HTTP requests, ${apisCount} external APIs`);
+      logger.info('Analysis complete', { requestsCount, apisCount });
 
       return createSuccessResult(
         {
-          nodes: requestsCount + apisCount,
-          edges: 0
+          nodes: requestsCount + apisCount + (this.networkNodeCreated ? 1 : 0),
+          edges: requestsCount  // CALLS edges from http:request to net:request
         },
         {
           requestsCount,
-          apisCount
+          apisCount,
+          networkSingletonCreated: this.networkNodeCreated
         }
       );
     } catch (error) {
-      console.error('[FetchAnalyzer] Error:', error);
+      logger.error('Analysis failed', { error });
       return createErrorResult(error as Error);
     }
   }
 
   private async analyzeModule(
     module: NodeRecord,
-    graph: PluginContext['graph']
+    graph: PluginContext['graph'],
+    networkId: string
   ): Promise<AnalysisResult> {
     try {
       const code = readFileSync(module.file!, 'utf-8');
@@ -138,7 +154,7 @@ export class FetchAnalyzer extends Plugin {
             const urlArg = node.arguments[0];
             const url = this.extractURL(urlArg);
             const method = this.extractMethod(node.arguments[1]) || 'GET';
-            const line = node.loc!.start.line;
+            const line = getLine(node);
 
             const request: HttpRequestNode = {
               id: `http:request#${method}:${url}#${module.file}#${line}`,
@@ -169,7 +185,7 @@ export class FetchAnalyzer extends Plugin {
             const method = ((callee as MemberExpression).property as Identifier).name.toUpperCase();
             const urlArg = node.arguments[0];
             const url = this.extractURL(urlArg);
-            const line = node.loc!.start.line;
+            const line = getLine(node);
 
             const request: HttpRequestNode = {
               id: `http:request#${method}:${url}#${module.file}#${line}`,
@@ -213,7 +229,7 @@ export class FetchAnalyzer extends Plugin {
               const method = methodProp
                 ? this.extractString((methodProp as { value: Node }).value) || 'GET'
                 : 'GET';
-              const line = node.loc!.start.line;
+              const line = getLine(node);
 
               const request: HttpRequestNode = {
                 id: `http:request#${method.toUpperCase()}:${url}#${module.file}#${line}`,
@@ -245,7 +261,7 @@ export class FetchAnalyzer extends Plugin {
               const urlArg = node.arguments[0];
               const url = this.extractURL(urlArg);
               const method = this.extractMethod(node.arguments[1]) || 'GET';
-              const line = node.loc!.start.line;
+              const line = getLine(node);
 
               const request: HttpRequestNode = {
                 id: `http:request#${method}:${url}#${module.file}#${line}`,
@@ -279,6 +295,13 @@ export class FetchAnalyzer extends Plugin {
           dst: request.id
         });
 
+        // http:request --CALLS--> net:request singleton
+        await graph.addEdge({
+          type: 'CALLS',
+          src: request.id,
+          dst: networkId
+        });
+
         // Ищем FUNCTION node которая делает запрос
         const functions: NodeRecord[] = [];
         for await (const fn of graph.queryNodes({ type: 'FUNCTION' })) {
@@ -339,7 +362,7 @@ export class FetchAnalyzer extends Plugin {
         apis: externalAPIs.size
       };
     } catch (error) {
-      console.error(`[FetchAnalyzer] Error analyzing ${module.file}:`, (error as Error).message);
+      // Silent - per-module errors shouldn't spam logs
       return { requests: 0, apis: 0 };
     }
   }