septum 0.1.4 → 0.1.5

package/src/core/parser/extractors/mcp-cli-semantic.ts

@@ -1,199 +1,199 @@
-import * as fs from "node:fs";
-import * as path from "node:path";
-import type { SemanticSliceExtractor, VerticalSliceCandidate } from "./semantic-extractor.interface.ts";
-
-export class McpCliSemanticExtractor implements SemanticSliceExtractor {
-  public readonly id = "mcp-cli";
-  public readonly name = "MCP Server & CLI Semantic Extractor";
-
-  public canHandle(projectRoot: string, framework?: string): boolean {
-    if (framework === "mcp-server" || framework === "cli") return true;
-
-    // Check presence of CLI or MCP directories
-    const hasMcp = fs.existsSync(path.join(projectRoot, "src/mcp/tools"));
-    const hasCli = fs.existsSync(path.join(projectRoot, "src/cli/commands"));
-    if (hasMcp || hasCli) return true;
-
-    // Check package.json for bin or MCP SDK
-    const pkgPath = path.join(projectRoot, "package.json");
-    if (fs.existsSync(pkgPath)) {
-      try {
-        const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
-        if (pkg.bin || pkg.dependencies?.["@modelcontextprotocol/sdk"]) {
-          return true;
-        }
-      } catch {}
-    }
-
-    return false;
-  }
-
-  public extractSlices(projectRoot: string, domainId?: number): VerticalSliceCandidate[] {
-    const slices: VerticalSliceCandidate[] = [];
-
-    // 1. Extract MCP Tools
-    const mcpToolsDir = path.join(projectRoot, "src/mcp/tools");
-    if (fs.existsSync(mcpToolsDir)) {
-      try {
-        const toolFiles = fs
-          .readdirSync(mcpToolsDir)
-          .filter((f) => f.endsWith(".ts") || f.endsWith(".js"));
-
-        for (const file of toolFiles) {
-          const fullPath = path.join(mcpToolsDir, file);
-          const relPath = path.relative(projectRoot, fullPath);
-          const content = fs.readFileSync(fullPath, "utf-8");
-          const baseName = path.basename(file, path.extname(file)); // e.g. 'get-domain-catalog'
-          const toolIdentifier = `septum_${baseName.replace(/-/g, "_")}`;
-
-          // Detect handler function
-          const handlerMatch = content.match(/export\s+async?\s+function\s+([a-zA-Z0-9_]+)/);
-          const actionName = handlerMatch ? handlerMatch[1] : `handle_${baseName}`;
-
-          // Detect args interface
-          const argsMatch = content.match(/export\s+interface\s+([a-zA-Z0-9_]+Args)/);
-          const formRequestClass = argsMatch ? argsMatch[1] : null;
-
-          // Detect model/service dependency (e.g. SeptumRepository, ConfigLoader)
-          let modelClass: string | null = null;
-          if (content.includes("SeptumRepository")) modelClass = "SeptumRepository";
-          else if (content.includes("SessionManager")) modelClass = "SessionManager";
-          else if (content.includes("ConfigLoader")) modelClass = "ConfigLoader";
-
-          const mcpChain: Array<{ stage: string; symbol: string; file?: string; line?: number; description?: string }> = [
-            {
-              stage: "ingress",
-              symbol: `tool:${toolIdentifier}`,
-              file: relPath,
-              description: `MCP Tool Endpoint: ${toolIdentifier}`,
-            },
-          ];
-
-          if (formRequestClass) {
-            mcpChain.push({
-              stage: "validation",
-              symbol: formRequestClass,
-              file: relPath,
-              description: "MCP Argument Schema",
-            });
-          }
-
-          mcpChain.push({
-            stage: "controller",
-            symbol: `McpToolHandler::${actionName}`,
-            file: relPath,
-            line: 1,
-            description: `Tool Handler Execution`,
-          });
-
-          if (modelClass) {
-            mcpChain.push({
-              stage: "service",
-              symbol: modelClass,
-              file: "src/core/database/repository.ts",
-              description: "Core Engine Service",
-            });
-          }
-
-          slices.push({
-            domain_id: domainId ?? null,
-            feature_key: `mcp.${baseName}`,
-            http_method: "MCP",
-            route_uri: `tool:${toolIdentifier}`,
-            route_name: toolIdentifier,
-            controller_class: "McpToolHandler",
-            action_name: actionName,
-            controller_file: relPath,
-            controller_line: 1,
-            architecture_style: "rpc",
-            entry_kind: "mcp_tool",
-            execution_chain_json: JSON.stringify(mcpChain),
-          });
-        }
-      } catch {}
-    }
-
-    // 2. Extract CLI Commands
-    const cliCommandsDir = path.join(projectRoot, "src/cli/commands");
-    if (fs.existsSync(cliCommandsDir)) {
-      try {
-        const commandFiles = fs
-          .readdirSync(cliCommandsDir)
-          .filter((f) => f.endsWith(".ts") || f.endsWith(".js"));
-
-        for (const file of commandFiles) {
-          const fullPath = path.join(cliCommandsDir, file);
-          const relPath = path.relative(projectRoot, fullPath);
-          const content = fs.readFileSync(fullPath, "utf-8");
-          const commandName = path.basename(file, path.extname(file)); // e.g. 'ingest', 'check'
-
-          const handlerMatch = content.match(/export\s+async?\s+function\s+([a-zA-Z0-9_]+Command)/);
-          const actionName = handlerMatch ? handlerMatch[1] : `handle${commandName.charAt(0).toUpperCase() + commandName.slice(1)}Command`;
-
-          // Detect options / args
-          const optionsMatch = content.match(/interface\s+([a-zA-Z0-9_]+Options)/);
-          const formRequestClass = optionsMatch ? optionsMatch[1] : null;
-
-          // Detect Core Service used
-          let modelClass: string | null = null;
-          if (content.includes("IngestionPipeline")) modelClass = "IngestionPipeline";
-          else if (content.includes("BoundaryEvaluator")) modelClass = "BoundaryEvaluator";
-          else if (content.includes("VerticalSliceTracer")) modelClass = "VerticalSliceTracer";
-          else if (content.includes("SeptumRepository")) modelClass = "SeptumRepository";
-
-          const cliChain: Array<{ stage: string; symbol: string; file?: string; line?: number; description?: string }> = [
-            {
-              stage: "ingress",
-              symbol: `septum ${commandName}`,
-              file: relPath,
-              description: `CLI Command Entrypoint: septum ${commandName}`,
-            },
-          ];
-
-          if (formRequestClass) {
-            cliChain.push({
-              stage: "validation",
-              symbol: formRequestClass,
-              file: relPath,
-              description: "CLI Options Interface",
-            });
-          }
-
-          cliChain.push({
-            stage: "controller",
-            symbol: `CLICommandHandler::${actionName}`,
-            file: relPath,
-            line: 1,
-            description: "Command Execution Handler",
-          });
-
-          if (modelClass) {
-            cliChain.push({
-              stage: "service",
-              symbol: modelClass,
-              file: "src/core/",
-              description: "Core Engine Service",
-            });
-          }
-
-          slices.push({
-            domain_id: domainId ?? null,
-            feature_key: `cli.${commandName}`,
-            http_method: "CLI",
-            route_uri: `command:${commandName}`,
-            route_name: `septum ${commandName}`,
-            controller_class: "CLICommandHandler",
-            action_name: actionName,
-            controller_file: relPath,
-            controller_line: 1,
-            architecture_style: "cli",
-            entry_kind: "cli_command",
-            execution_chain_json: JSON.stringify(cliChain),
-          });
-        }
-      } catch {}
-    }
-
-    return slices;
-  }
-}
+import * as fs from "node:fs";
+import * as path from "node:path";
+import type { SemanticSliceExtractor, VerticalSliceCandidate } from "./semantic-extractor.interface.ts";
+
+export class McpCliSemanticExtractor implements SemanticSliceExtractor {
+  public readonly id = "mcp-cli";
+  public readonly name = "MCP Server & CLI Semantic Extractor";
+
+  public canHandle(projectRoot: string, framework?: string): boolean {
+    if (framework === "mcp-server" || framework === "cli") return true;
+
+    // Check presence of CLI or MCP directories
+    const hasMcp = fs.existsSync(path.join(projectRoot, "src/mcp/tools"));
+    const hasCli = fs.existsSync(path.join(projectRoot, "src/cli/commands"));
+    if (hasMcp || hasCli) return true;
+
+    // Check package.json for bin or MCP SDK
+    const pkgPath = path.join(projectRoot, "package.json");
+    if (fs.existsSync(pkgPath)) {
+      try {
+        const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
+        if (pkg.bin || pkg.dependencies?.["@modelcontextprotocol/sdk"]) {
+          return true;
+        }
+      } catch {}
+    }
+
+    return false;
+  }
+
+  public extractSlices(projectRoot: string, domainId?: number): VerticalSliceCandidate[] {
+    const slices: VerticalSliceCandidate[] = [];
+
+    // 1. Extract MCP Tools
+    const mcpToolsDir = path.join(projectRoot, "src/mcp/tools");
+    if (fs.existsSync(mcpToolsDir)) {
+      try {
+        const toolFiles = fs
+          .readdirSync(mcpToolsDir)
+          .filter((f) => f.endsWith(".ts") || f.endsWith(".js"));
+
+        for (const file of toolFiles) {
+          const fullPath = path.join(mcpToolsDir, file);
+          const relPath = path.relative(projectRoot, fullPath);
+          const content = fs.readFileSync(fullPath, "utf-8");
+          const baseName = path.basename(file, path.extname(file)); // e.g. 'get-domain-catalog'
+          const toolIdentifier = `septum_${baseName.replace(/-/g, "_")}`;
+
+          // Detect handler function
+          const handlerMatch = content.match(/export\s+async?\s+function\s+([a-zA-Z0-9_]+)/);
+          const actionName = handlerMatch ? handlerMatch[1] : `handle_${baseName}`;
+
+          // Detect args interface
+          const argsMatch = content.match(/export\s+interface\s+([a-zA-Z0-9_]+Args)/);
+          const formRequestClass = argsMatch ? argsMatch[1] : null;
+
+          // Detect model/service dependency (e.g. SeptumRepository, ConfigLoader)
+          let modelClass: string | null = null;
+          if (content.includes("SeptumRepository")) modelClass = "SeptumRepository";
+          else if (content.includes("SessionManager")) modelClass = "SessionManager";
+          else if (content.includes("ConfigLoader")) modelClass = "ConfigLoader";
+
+          const mcpChain: Array<{ stage: string; symbol: string; file?: string; line?: number; description?: string }> = [
+            {
+              stage: "ingress",
+              symbol: `tool:${toolIdentifier}`,
+              file: relPath,
+              description: `MCP Tool Endpoint: ${toolIdentifier}`,
+            },
+          ];
+
+          if (formRequestClass) {
+            mcpChain.push({
+              stage: "validation",
+              symbol: formRequestClass,
+              file: relPath,
+              description: "MCP Argument Schema",
+            });
+          }
+
+          mcpChain.push({
+            stage: "controller",
+            symbol: `McpToolHandler::${actionName}`,
+            file: relPath,
+            line: 1,
+            description: `Tool Handler Execution`,
+          });
+
+          if (modelClass) {
+            mcpChain.push({
+              stage: "service",
+              symbol: modelClass,
+              file: "src/core/database/repository.ts",
+              description: "Core Engine Service",
+            });
+          }
+
+          slices.push({
+            domain_id: domainId ?? null,
+            feature_key: `mcp.${baseName}`,
+            http_method: "MCP",
+            route_uri: `tool:${toolIdentifier}`,
+            route_name: toolIdentifier,
+            controller_class: "McpToolHandler",
+            action_name: actionName,
+            controller_file: relPath,
+            controller_line: 1,
+            architecture_style: "rpc",
+            entry_kind: "mcp_tool",
+            execution_chain_json: JSON.stringify(mcpChain),
+          });
+        }
+      } catch {}
+    }
+
+    // 2. Extract CLI Commands
+    const cliCommandsDir = path.join(projectRoot, "src/cli/commands");
+    if (fs.existsSync(cliCommandsDir)) {
+      try {
+        const commandFiles = fs
+          .readdirSync(cliCommandsDir)
+          .filter((f) => f.endsWith(".ts") || f.endsWith(".js"));
+
+        for (const file of commandFiles) {
+          const fullPath = path.join(cliCommandsDir, file);
+          const relPath = path.relative(projectRoot, fullPath);
+          const content = fs.readFileSync(fullPath, "utf-8");
+          const commandName = path.basename(file, path.extname(file)); // e.g. 'ingest', 'check'
+
+          const handlerMatch = content.match(/export\s+async?\s+function\s+([a-zA-Z0-9_]+Command)/);
+          const actionName = handlerMatch ? handlerMatch[1] : `handle${commandName.charAt(0).toUpperCase() + commandName.slice(1)}Command`;
+
+          // Detect options / args
+          const optionsMatch = content.match(/interface\s+([a-zA-Z0-9_]+Options)/);
+          const formRequestClass = optionsMatch ? optionsMatch[1] : null;
+
+          // Detect Core Service used
+          let modelClass: string | null = null;
+          if (content.includes("IngestionPipeline")) modelClass = "IngestionPipeline";
+          else if (content.includes("BoundaryEvaluator")) modelClass = "BoundaryEvaluator";
+          else if (content.includes("VerticalSliceTracer")) modelClass = "VerticalSliceTracer";
+          else if (content.includes("SeptumRepository")) modelClass = "SeptumRepository";
+
+          const cliChain: Array<{ stage: string; symbol: string; file?: string; line?: number; description?: string }> = [
+            {
+              stage: "ingress",
+              symbol: `septum ${commandName}`,
+              file: relPath,
+              description: `CLI Command Entrypoint: septum ${commandName}`,
+            },
+          ];
+
+          if (formRequestClass) {
+            cliChain.push({
+              stage: "validation",
+              symbol: formRequestClass,
+              file: relPath,
+              description: "CLI Options Interface",
+            });
+          }
+
+          cliChain.push({
+            stage: "controller",
+            symbol: `CLICommandHandler::${actionName}`,
+            file: relPath,
+            line: 1,
+            description: "Command Execution Handler",
+          });
+
+          if (modelClass) {
+            cliChain.push({
+              stage: "service",
+              symbol: modelClass,
+              file: "src/core/",
+              description: "Core Engine Service",
+            });
+          }
+
+          slices.push({
+            domain_id: domainId ?? null,
+            feature_key: `cli.${commandName}`,
+            http_method: "CLI",
+            route_uri: `command:${commandName}`,
+            route_name: `septum ${commandName}`,
+            controller_class: "CLICommandHandler",
+            action_name: actionName,
+            controller_file: relPath,
+            controller_line: 1,
+            architecture_style: "cli",
+            entry_kind: "cli_command",
+            execution_chain_json: JSON.stringify(cliChain),
+          });
+        }
+      } catch {}
+    }
+
+    return slices;
+  }
+}

package/src/core/parser/extractors/nestjs-semantic.ts

@@ -1,119 +1,119 @@
-import * as fs from "node:fs";
-import * as path from "node:path";
-import type { SemanticSliceExtractor, VerticalSliceCandidate } from "./semantic-extractor.interface.ts";
-
-export class NestJsSemanticExtractor implements SemanticSliceExtractor {
-  public readonly id = "nestjs";
-  public readonly name = "NestJS Modular Semantic Extractor";
-
-  public canHandle(projectRoot: string, framework?: string): boolean {
-    if (framework === "nestjs") return true;
-
-    if (fs.existsSync(path.join(projectRoot, "nest-cli.json"))) return true;
-
-    const pkgPath = path.join(projectRoot, "package.json");
-    if (fs.existsSync(pkgPath)) {
-      try {
-        const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
-        const deps = { ...pkg.dependencies, ...pkg.devDependencies };
-        if (deps["@nestjs/core"]) return true;
-      } catch {}
-    }
-
-    return false;
-  }
-
-  public extractSlices(projectRoot: string, domainId?: number): VerticalSliceCandidate[] {
-    const slices: VerticalSliceCandidate[] = [];
-    const srcDir = path.join(projectRoot, "src");
-    if (!fs.existsSync(srcDir)) return slices;
-
-    const controllerFiles = this.findFilesRecursively(srcDir, /\.controller\.(ts|js)$/);
-
-    for (const file of controllerFiles) {
-      const relPath = path.relative(projectRoot, file);
-      const content = fs.readFileSync(file, "utf-8");
-
-      // Extract @Controller('prefix')
-      const controllerMatch = content.match(/@Controller\s*\(\s*['"]?([^'")]*)['"]?\s*\)\s*export\s+class\s+([A-Za-z0-9_]+)/);
-      if (!controllerMatch) continue;
-
-      const routePrefix = controllerMatch[1] ? `/${controllerMatch[1].replace(/^\/+|\/+$/g, "")}` : "";
-      const controllerClass = controllerMatch[2];
-
-      // Extract methods: @Get('path'), @Post('path'), etc.
-      const methodRegex = /@(Get|Post|Put|Patch|Delete)\s*\(\s*['"]?([^'")]*)['"]?\s*\)\s*(?:@[A-Za-z0-9_]+\s*\([^)]*\)\s*)*\s*(?:async\s+)?([a-zA-Z0-9_]+)\s*\(([^)]*)\)/g;
-      let match: RegExpExecArray | null;
-
-      while ((match = methodRegex.exec(content)) !== null) {
-        const httpMethod = match[1].toUpperCase();
-        const subPath = match[2] ? `/${match[2].replace(/^\/+|\/+$/g, "")}` : "";
-        const fullUri = `${routePrefix}${subPath}` || "/";
-        const actionName = match[3];
-        const params = match[4];
-
-        // Extract DTO from parameters: e.g. @Body() createDto: CreateUserDto
-        const dtoMatch = params.match(/@Body\s*\([^)]*\)\s*[a-zA-Z0-9_]+\s*:\s*([A-Za-z0-9_]+Dto)/);
-        const formRequestClass = dtoMatch ? dtoMatch[1] : null;
-
-        const chain: Array<{ stage: string; symbol: string; file?: string; line?: number; description?: string }> = [
-          {
-            stage: "ingress",
-            symbol: `${httpMethod} ${fullUri}`,
-            file: relPath,
-            description: `NestJS Route: ${httpMethod} ${fullUri}`,
-          },
-        ];
-
-        if (formRequestClass) {
-          chain.push({
-            stage: "validation",
-            symbol: formRequestClass,
-            description: "DTO Validation",
-          });
-        }
-
-        chain.push({
-          stage: "controller",
-          symbol: `${controllerClass}::${actionName}`,
-          file: relPath,
-          line: 1,
-          description: `NestJS Controller Action`,
-        });
-
-        slices.push({
-          domain_id: domainId ?? null,
-          feature_key: `nest.${controllerClass.toLowerCase().replace("controller", "")}.${actionName}`,
-          http_method: httpMethod,
-          route_uri: fullUri,
-          route_name: `${controllerClass}.${actionName}`,
-          controller_class: controllerClass,
-          action_name: actionName,
-          controller_file: relPath,
-          controller_line: 1,
-          architecture_style: "mvc",
-          entry_kind: "http_route",
-          execution_chain_json: JSON.stringify(chain),
-        });
-      }
-    }
-
-    return slices;
-  }
-
-  private findFilesRecursively(dir: string, pattern: RegExp): string[] {
-    const results: string[] = [];
-    try {
-      const entries = fs.readdirSync(dir, { withFileTypes: true });
-      for (const entry of entries) {
-        const full = path.join(dir, entry.name);
-        if (entry.isDirectory() && !entry.name.startsWith(".") && entry.name !== "node_modules") {
-          results.push(...this.findFilesRecursively(full, pattern));
-        } else if (entry.isFile() && pattern.test(entry.name)) {
-          results.push(full);
-        }
-      }
-    } catch {}
-    return results;
-  }
-}
+import * as fs from "node:fs";
+import * as path from "node:path";
+import type { SemanticSliceExtractor, VerticalSliceCandidate } from "./semantic-extractor.interface.ts";
+
+export class NestJsSemanticExtractor implements SemanticSliceExtractor {
+  public readonly id = "nestjs";
+  public readonly name = "NestJS Modular Semantic Extractor";
+
+  public canHandle(projectRoot: string, framework?: string): boolean {
+    if (framework === "nestjs") return true;
+
+    if (fs.existsSync(path.join(projectRoot, "nest-cli.json"))) return true;
+
+    const pkgPath = path.join(projectRoot, "package.json");
+    if (fs.existsSync(pkgPath)) {
+      try {
+        const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
+        const deps = { ...pkg.dependencies, ...pkg.devDependencies };
+        if (deps["@nestjs/core"]) return true;
+      } catch {}
+    }
+
+    return false;
+  }
+
+  public extractSlices(projectRoot: string, domainId?: number): VerticalSliceCandidate[] {
+    const slices: VerticalSliceCandidate[] = [];
+    const srcDir = path.join(projectRoot, "src");
+    if (!fs.existsSync(srcDir)) return slices;
+
+    const controllerFiles = this.findFilesRecursively(srcDir, /\.controller\.(ts|js)$/);
+
+    for (const file of controllerFiles) {
+      const relPath = path.relative(projectRoot, file);
+      const content = fs.readFileSync(file, "utf-8");
+
+      // Extract @Controller('prefix')
+      const controllerMatch = content.match(/@Controller\s*\(\s*['"]?([^'")]*)['"]?\s*\)\s*export\s+class\s+([A-Za-z0-9_]+)/);
+      if (!controllerMatch) continue;
+
+      const routePrefix = controllerMatch[1] ? `/${controllerMatch[1].replace(/^\/+|\/+$/g, "")}` : "";
+      const controllerClass = controllerMatch[2];
+
+      // Extract methods: @Get('path'), @Post('path'), etc.
+      const methodRegex = /@(Get|Post|Put|Patch|Delete)\s*\(\s*['"]?([^'")]*)['"]?\s*\)\s*(?:@[A-Za-z0-9_]+\s*\([^)]*\)\s*)*\s*(?:async\s+)?([a-zA-Z0-9_]+)\s*\(([^)]*)\)/g;
+      let match: RegExpExecArray | null;
+
+      while ((match = methodRegex.exec(content)) !== null) {
+        const httpMethod = match[1].toUpperCase();
+        const subPath = match[2] ? `/${match[2].replace(/^\/+|\/+$/g, "")}` : "";
+        const fullUri = `${routePrefix}${subPath}` || "/";
+        const actionName = match[3];
+        const params = match[4];
+
+        // Extract DTO from parameters: e.g. @Body() createDto: CreateUserDto
+        const dtoMatch = params.match(/@Body\s*\([^)]*\)\s*[a-zA-Z0-9_]+\s*:\s*([A-Za-z0-9_]+Dto)/);
+        const formRequestClass = dtoMatch ? dtoMatch[1] : null;
+
+        const chain: Array<{ stage: string; symbol: string; file?: string; line?: number; description?: string }> = [
+          {
+            stage: "ingress",
+            symbol: `${httpMethod} ${fullUri}`,
+            file: relPath,
+            description: `NestJS Route: ${httpMethod} ${fullUri}`,
+          },
+        ];
+
+        if (formRequestClass) {
+          chain.push({
+            stage: "validation",
+            symbol: formRequestClass,
+            description: "DTO Validation",
+          });
+        }
+
+        chain.push({
+          stage: "controller",
+          symbol: `${controllerClass}::${actionName}`,
+          file: relPath,
+          line: 1,
+          description: `NestJS Controller Action`,
+        });
+
+        slices.push({
+          domain_id: domainId ?? null,
+          feature_key: `nest.${controllerClass.toLowerCase().replace("controller", "")}.${actionName}`,
+          http_method: httpMethod,
+          route_uri: fullUri,
+          route_name: `${controllerClass}.${actionName}`,
+          controller_class: controllerClass,
+          action_name: actionName,
+          controller_file: relPath,
+          controller_line: 1,
+          architecture_style: "mvc",
+          entry_kind: "http_route",
+          execution_chain_json: JSON.stringify(chain),
+        });
+      }
+    }
+
+    return slices;
+  }
+
+  private findFilesRecursively(dir: string, pattern: RegExp): string[] {
+    const results: string[] = [];
+    try {
+      const entries = fs.readdirSync(dir, { withFileTypes: true });
+      for (const entry of entries) {
+        const full = path.join(dir, entry.name);
+        if (entry.isDirectory() && !entry.name.startsWith(".") && entry.name !== "node_modules") {
+          results.push(...this.findFilesRecursively(full, pattern));
+        } else if (entry.isFile() && pattern.test(entry.name)) {
+          results.push(full);
+        }
+      }
+    } catch {}
+    return results;
+  }
+}