Merge pull request #51 from qodex-ai/nodejs_esprima_version_fix

Nodejs esprima version fix

Author: ankitQodex

config.yml

@@ -18,7 +18,6 @@ ignored_dirs:
   - downloads
   - eggs
   - .eggs
-  - lib
   - lib64
   - parts
   - sdist

nodejs_pipeline/find_api_definition_files.py

@@ -9,9 +9,17 @@
     'api', 'endpoint', 'router', 'controller', 'middleware', 'rest'
 }
 
+HTTP_METHODS = ['get', 'post', 'put', 'delete', 'patch', 'options', 'head']
+ROUTE_OBJECT_PREFIXES = ['app', 'router', 'route', 'api', 'controller', 'server']
+ROUTE_OBJECT_SUFFIXES = ['Router', 'Routes', 'Api', 'Controller', 'App', 'Server']
+
+route_prefix_pattern = r'(?:' + '|'.join(ROUTE_OBJECT_PREFIXES) + r')'
+route_suffix_pattern = r'(?:[A-Za-z_$][\w$]*?(?:' + '|'.join(ROUTE_OBJECT_SUFFIXES) + r'))'
+route_object_pattern = r'(?:' + route_prefix_pattern + r'|' + route_suffix_pattern + r')'
+
 # Regex patterns to detect API routes or decorators
 ROUTE_METHOD_PATTERN = re.compile(
-    r'\b(app|router|route)\s*\.\s*(' + '|'.join(API_DECORATOR_NAMES) + r')\s*\(',
+    r'\b' + route_object_pattern + r'\s*\.\s*(?:' + '|'.join(HTTP_METHODS) + r')\s*\(',
     re.IGNORECASE
 )
 

nodejs_pipeline/identify_api_functions.py

@@ -1,18 +1,71 @@
 from pathlib import Path
 import esprima
 import json
+import re
 
 
-API_METHODS = {"get", "post", "put", "delete", "patch"}
+API_METHODS = {"get", "post", "put", "delete", "patch", "options", "head"}
+ROUTE_OBJECT_KEYWORDS = {"app", "router", "route", "api", "controller", "server"}
+ROUTE_OBJECT_SUFFIXES = ("router", "routes", "route", "app", "server", "controller", "api")
+OPTIONAL_CATCH_PATTERN = re.compile(r'catch\s*(\{)')
+FALLBACK_ENDPOINT_PATTERN = re.compile(
+    r'(?P<object>[A-Za-z_$][\w$]*)\s*\.\s*(?P<method>GET|POST|PUT|DELETE|PATCH|OPTIONS|HEAD)\s*\(\s*(?P<route>["\'].*?["\'])?',
+    re.IGNORECASE | re.DOTALL
+)
+
+
+def _parse_with_optional_catch_fallback(source, *, loc=True):
+    """
+    Attempt to parse JavaScript source. If the parser fails because of
+    optional catch binding syntax (catch { ... }), rewrite those blocks
+    to catch (__apimesh_err) { ... } and retry once.
+    """
+    try:
+        return esprima.parseModule(source, loc=loc)
+    except Exception as first_error:
+        patched_source, replaced = OPTIONAL_CATCH_PATTERN.subn('catch (__apimesh_err) {', source)
+        if not replaced:
+            raise first_error
+        try:
+            return esprima.parseModule(patched_source, loc=loc)
+        except Exception:
+            raise first_error
+
+
+def _extract_endpoints_with_regex(source: str, file_path: Path):
+    """Fallback endpoint detector when esprima cannot parse the file."""
+    endpoints = []
+    for match in FALLBACK_ENDPOINT_PATTERN.finditer(source):
+        method = match.group('method').upper()
+        route_literal = match.group('route')
+        route = None
+        if route_literal and len(route_literal) >= 2:
+            route = route_literal[1:-1]
+        start = match.start()
+        end = match.end()
+        start_line = source.count('\n', 0, start) + 1
+        end_line = source.count('\n', 0, end) + 1
+        obj = match.group('object') or ""
+        low = obj.lower()
+        if not (low in ROUTE_OBJECT_KEYWORDS or any(low.endswith(suf) for suf in ROUTE_OBJECT_SUFFIXES) or low.startswith(('app', 'api'))):
+            continue
+        endpoints.append({
+            "type": "function",
+            "method": method,
+            "route": route,
+            "start_line": start_line,
+            "end_line": end_line,
+            "file_path": str(file_path)
+        })
+    return endpoints
 
 
 def find_api_endpoints_js(file_path: Path):
     try:
         source = file_path.read_text(encoding='utf-8')
-        tree = esprima.parseModule(source, loc=True)  # loc=True gives line numbers
+        tree = _parse_with_optional_catch_fallback(source, loc=True)
     except Exception as e:
-        print(f"Error parsing {file_path}: {e}")
-        return []
+        return _extract_endpoints_with_regex(source, file_path)
 
     endpoints = []