sprint-es 0.0.80 → 0.0.81

package/dist/cjs/cli.cjs

@@ -117,7 +117,7 @@ function scanDirectory(dir, extensions) {
   }
   return files;
 }
-function extractRoutesFromFile(filePath) {
+function extractRoutesFromFile(filePath, schemaNames) {
   const routes = [];
   try {
     const content = fs.readFileSync(filePath, "utf-8");
@@ -126,42 +126,44 @@ function extractRoutesFromFile(filePath) {
     for (const line of lines) {
       const trimmed = line.trim();
       for (const method of routerMethods) {
-        const match = trimmed.match(new RegExp(`router\\.${method}\\s*\\(\\s*['"\`]([^'"\`]+)['"\`]`));
+        const match = trimmed.match(new RegExp(`router\\.${method}\\s*\\(\\s*['"\`]([^'"\`]+)['"\`]\\s*,\\s*([^,)]+)`));
         if (match) {
+          const routePath = match[1];
+          const firstArg = match[2].trim().split(",")[0].trim();
+          const hasSchema = schemaNames.has(firstArg);
           routes.push({
             file: filePath,
-            path: match[1],
+            path: routePath,
             method: method.toUpperCase(),
-            hasSchema: false
+            hasSchema
           });
           break;
         }
       }
     }
-  } catch {
+  } catch (e) {
+    console.error("Error extracting routes:", e);
   }
   return routes;
 }
-function checkRouteHasSchema(filePath, routePath, method) {
-  try {
-    const content = fs.readFileSync(filePath, "utf-8");
-    const routePattern = new RegExp(`router\\.${method.toLowerCase()}\\s*\\(\\s*['"\`]${routePath.replace("/", "\\/")}['"\`]\\s*,\\s*(\\w+)`);
-    const schemaVarMatch = content.match(routePattern);
-    if (schemaVarMatch) {
-      const schemaVar = schemaVarMatch[1];
-      const schemaDefinitionPattern = new RegExp(`export\\s+const\\s+${schemaVar}\\s*=\\s*defineRouteSchema`);
-      if (schemaDefinitionPattern.test(content)) {
-        return true;
+function extractAllSchemaNames(projectRoot2) {
+  const schemaNames = /* @__PURE__ */ new Set();
+  const schemasPath = path.join(projectRoot2, "src/schemas");
+  if (!fs.existsSync(schemasPath)) {
+    return schemaNames;
+  }
+  const schemaFiles = scanDirectory(schemasPath, [".ts", ".js"]);
+  for (const file of schemaFiles) {
+    try {
+      const content = fs.readFileSync(file, "utf-8");
+      const matches = content.matchAll(/export\s+const\s+(\w+)\s*=/g);
+      for (const match of matches) {
+        schemaNames.add(match[1]);
       }
+    } catch {
     }
-    const directSchemaPattern = new RegExp(`router\\.${method.toLowerCase()}\\s*\\(\\s*['"\`]${routePath.replace("/", "\\/")}['"\`]\\s*,\\s*defineRouteSchema`);
-    if (directSchemaPattern.test(content)) {
-      return true;
-    }
-    return false;
-  } catch {
-    return false;
   }
+  return schemaNames;
 }
 function hasSchemaInMiddleware(filePath) {
   try {
@@ -209,15 +211,13 @@ async function runDoctor() {
   logger.info("🔍 Sprint Doctor - Analyzing routes and middlewares...\n");
   const routesPath = path.join(projectRoot, "src/routes");
   const middlewaresPath = path.join(projectRoot, "src/middlewares");
+  const schemaNames = extractAllSchemaNames(projectRoot);
   const routeFiles = scanDirectory(routesPath, [".ts", ".js"]);
   const middlewareFiles = scanDirectory(middlewaresPath, [".ts", ".js"]);
   const allRoutes = [];
   for (const file of routeFiles) {
-    const routes = extractRoutesFromFile(file);
-    for (const route of routes) {
-      route.hasSchema = checkRouteHasSchema(file, route.path, route.method);
-      allRoutes.push(route);
-    }
+    const routes = extractRoutesFromFile(file, schemaNames);
+    allRoutes.push(...routes);
   }
   const middlewares = [];
   for (const file of middlewareFiles) {

package/dist/esm/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { existsSync, readdirSync, statSync, readFileSync } from "fs";
+import { existsSync, readFileSync, readdirSync, statSync } from "fs";
 import * as crypto from "crypto";
 import { join, resolve } from "path";
 import { spawn } from "child_process";
@@ -99,7 +99,7 @@ function scanDirectory(dir, extensions) {
   }
   return files;
 }
-function extractRoutesFromFile(filePath) {
+function extractRoutesFromFile(filePath, schemaNames) {
   const routes = [];
   try {
     const content = readFileSync(filePath, "utf-8");
@@ -108,42 +108,44 @@ function extractRoutesFromFile(filePath) {
     for (const line of lines) {
       const trimmed = line.trim();
       for (const method of routerMethods) {
-        const match = trimmed.match(new RegExp(`router\\.${method}\\s*\\(\\s*['"\`]([^'"\`]+)['"\`]`));
+        const match = trimmed.match(new RegExp(`router\\.${method}\\s*\\(\\s*['"\`]([^'"\`]+)['"\`]\\s*,\\s*([^,)]+)`));
         if (match) {
+          const routePath = match[1];
+          const firstArg = match[2].trim().split(",")[0].trim();
+          const hasSchema = schemaNames.has(firstArg);
           routes.push({
             file: filePath,
-            path: match[1],
+            path: routePath,
             method: method.toUpperCase(),
-            hasSchema: false
+            hasSchema
           });
           break;
         }
       }
     }
-  } catch {
+  } catch (e) {
+    console.error("Error extracting routes:", e);
   }
   return routes;
 }
-function checkRouteHasSchema(filePath, routePath, method) {
-  try {
-    const content = readFileSync(filePath, "utf-8");
-    const routePattern = new RegExp(`router\\.${method.toLowerCase()}\\s*\\(\\s*['"\`]${routePath.replace("/", "\\/")}['"\`]\\s*,\\s*(\\w+)`);
-    const schemaVarMatch = content.match(routePattern);
-    if (schemaVarMatch) {
-      const schemaVar = schemaVarMatch[1];
-      const schemaDefinitionPattern = new RegExp(`export\\s+const\\s+${schemaVar}\\s*=\\s*defineRouteSchema`);
-      if (schemaDefinitionPattern.test(content)) {
-        return true;
+function extractAllSchemaNames(projectRoot2) {
+  const schemaNames = /* @__PURE__ */ new Set();
+  const schemasPath = join(projectRoot2, "src/schemas");
+  if (!existsSync(schemasPath)) {
+    return schemaNames;
+  }
+  const schemaFiles = scanDirectory(schemasPath, [".ts", ".js"]);
+  for (const file of schemaFiles) {
+    try {
+      const content = readFileSync(file, "utf-8");
+      const matches = content.matchAll(/export\s+const\s+(\w+)\s*=/g);
+      for (const match of matches) {
+        schemaNames.add(match[1]);
       }
+    } catch {
     }
-    const directSchemaPattern = new RegExp(`router\\.${method.toLowerCase()}\\s*\\(\\s*['"\`]${routePath.replace("/", "\\/")}['"\`]\\s*,\\s*defineRouteSchema`);
-    if (directSchemaPattern.test(content)) {
-      return true;
-    }
-    return false;
-  } catch {
-    return false;
   }
+  return schemaNames;
 }
 function hasSchemaInMiddleware(filePath) {
   try {
@@ -191,15 +193,13 @@ async function runDoctor() {
   logger.info("🔍 Sprint Doctor - Analyzing routes and middlewares...\n");
   const routesPath = join(projectRoot, "src/routes");
   const middlewaresPath = join(projectRoot, "src/middlewares");
+  const schemaNames = extractAllSchemaNames(projectRoot);
   const routeFiles = scanDirectory(routesPath, [".ts", ".js"]);
   const middlewareFiles = scanDirectory(middlewaresPath, [".ts", ".js"]);
   const allRoutes = [];
   for (const file of routeFiles) {
-    const routes = extractRoutesFromFile(file);
-    for (const route of routes) {
-      route.hasSchema = checkRouteHasSchema(file, route.path, route.method);
-      allRoutes.push(route);
-    }
+    const routes = extractRoutesFromFile(file, schemaNames);
+    allRoutes.push(...routes);
   }
   const middlewares = [];
   for (const file of middlewareFiles) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sprint-es",
-    "version": "0.0.80",
+    "version": "0.0.81",
     "description": "Sprint - Quickly API",
     "main": "dist/cjs/index.js",
     "module": "dist/esm/index.js",