improve path handling and references handling

Author: tkfoss

src/serverless_openapi_generator/openapi_generator.py

@@ -35,8 +35,11 @@ def _resolve_file_references(self, value):
                 abs_path = os.path.join(self.serverless_dir, file_path)
                 try:
                     with open(abs_path, 'r') as f:
-                        return yaml.safe_load(f)
-                except (IOError, yaml.YAMLError) as e:
+                        if file_path.endswith('.json'):
+                            return json.load(f)
+                        else:
+                            return yaml.safe_load(f)
+                except (IOError, yaml.YAMLError, json.JSONDecodeError) as e:
                     print(f"Warning: Could not read or parse file reference {abs_path}: {e}")
                     return value
         return value
@@ -128,13 +131,18 @@ def create_paths(self):
                     continue
 
                 # Handle path parameters
+                if path.startswith('/'):
+                    path = path[1:]
+                
                 if documentation.get('pathParams'):
                     for param in documentation.get('pathParams'):
                         path = path.replace(f"{{{param['name']}}}", "") # Remove if already there
                     path_params_str = "/".join([f"{{{p['name']}}}" for p in documentation.get('pathParams')])
-                    full_path = f"/{path}/{path_params_str}".replace('//','/')
+                    full_path = f"/{path}/{path_params_str}"
                 else:
                     full_path = f"/{path}"
+                
+                full_path = full_path.replace('//', '/')
 
 
                 if full_path not in paths:

src/serverless_openapi_generator/schema_handler.py

@@ -2,6 +2,7 @@
 import uuid
 import os
 import re
+import yaml
 from referencing import Registry, Resource
 from referencing.jsonschema import DRAFT4
 import requests
@@ -13,31 +14,49 @@ def __init__(self, serverless_config, open_api_spec, serverless_dir='.'):
         self.serverless_dir = serverless_dir
         self.models = self._standardize_models()
 
+    def _resolve_file_references(self, value):
+        if isinstance(value, dict):
+            return {k: self._resolve_file_references(v) for k, v in value.items()}
+        elif isinstance(value, list):
+            return [self._resolve_file_references(item) for item in value]
+        elif isinstance(value, str):
+            match = re.match(r'\${file\((.*)\)}', value)
+            if match:
+                file_path = match.group(1).strip()
+                abs_path = os.path.join(self.serverless_dir, file_path)
+                try:
+                    with open(abs_path, 'r') as f:
+                        if file_path.endswith('.json'):
+                            return json.load(f)
+                        else:
+                            return yaml.safe_load(f)
+                except (IOError, yaml.YAMLError, json.JSONDecodeError) as e:
+                    print(f"Warning: Could not read or parse file reference {abs_path}: {e}")
+                    return value
+        return value
+
     def _standardize_models(self):
-        documentation = self.serverless_config.get('custom', {})
-        if not documentation:
-            service_config = self.serverless_config.get('service', {})
-            if isinstance(service_config, dict):
-                documentation = service_config.get('custom', {}).get('documentation', {})
-            else:
-                documentation = {}
+        documentation = self.serverless_config.get('custom', {}).get('documentation', {})
 
         standardized_models = []
         model_sources = []
         if 'models' in documentation:
-            models_config = documentation['models']
+            models_config = self._resolve_file_references(documentation['models'])
             if isinstance(models_config, list):
                 model_sources.extend(models_config)
             elif isinstance(models_config, dict):
                 for name, definition in models_config.items():
                     model_sources.append({'name': name, **definition})
 
         if 'modelsList' in documentation:
-            model_sources.extend(documentation['modelsList'])
+            model_sources.extend(self._resolve_file_references(documentation['modelsList']))
 
         for model in model_sources:
             if not isinstance(model, dict) or 'name' not in model:
                 continue
+            
+            model = self._resolve_file_references(model)
+
             std_model = {
                 'name': model.get('name'),
                 'description': model.get('description', ''),
@@ -68,24 +87,6 @@ def create_schema(self, name, schema_definition):
         self.open_api['components']['schemas'][name] = final_schema
         return f"#/components/schemas/{name}"
 
-    def _resolve_file_references(self, value):
-        if isinstance(value, dict):
-            return {k: self._resolve_file_references(v) for k, v in value.items()}
-        elif isinstance(value, list):
-            return [self._resolve_file_references(item) for item in value]
-        elif isinstance(value, str):
-            match = re.match(r'\${file\((.*)\)}', value)
-            if match:
-                file_path = match.group(1).strip()
-                abs_path = os.path.join(self.serverless_dir, file_path)
-                try:
-                    with open(abs_path, 'r') as f:
-                        return json.load(f)
-                except (IOError, json.JSONDecodeError) as e:
-                    print(f"Warning: Could not read or parse file reference {abs_path}: {e}")
-                    return value
-        return value
-
     def _resolve_schema_references(self, schema):
         schema = self._resolve_file_references(schema)
         if not isinstance(schema, dict):