Improve support for sub directory

Author: dgarros

infrahub_sdk/ctl/graphql.py

@@ -4,15 +4,16 @@
 from pathlib import Path
 
 import typer
-from ariadne_codegen.client_generators.package import get_package_generator
+from ariadne_codegen.client_generators.package import PackageGenerator, get_package_generator
 from ariadne_codegen.plugins.explorer import get_plugins_types
 from ariadne_codegen.plugins.manager import PluginManager
 from ariadne_codegen.schema import (
     filter_operations_definitions,
-    get_graphql_queries,
     get_graphql_schema_from_path,
 )
 from ariadne_codegen.settings import ClientSettings, CommentsStrategy
+from ariadne_codegen.utils import ast_to_str
+from graphql import DefinitionNode, GraphQLSchema, NoUnusedFragmentsRule, parse, specified_rules, validate
 from rich.console import Console
 
 from ..async_typer import AsyncTyper
@@ -39,10 +40,39 @@ def find_gql_files(query_path: Path) -> list[Path]:
         raise FileNotFoundError(f"Directory not found: {query_path}")
 
     if not query_path.is_dir() and query_path.is_file():
-        yield query_path
+        return [query_path]
 
-    else:
-        yield from query_path.glob("*/*.gql")
+    return list(query_path.glob("**/*.gql"))
+
+
+def get_graphql_query(queries_path: Path, schema: GraphQLSchema) -> tuple[DefinitionNode, ...]:
+    """Get graphql queries definitions from a single GraphQL file."""
+
+    if not queries_path.exists():
+        raise FileNotFoundError(f"File not found: {queries_path}")
+    if not queries_path.is_file():
+        raise ValueError(f"{queries_path} is not a file")
+
+    queries_str = queries_path.read_text(encoding="utf-8")
+    queries_ast = parse(queries_str)
+    validation_errors = validate(
+        schema=schema,
+        document_ast=queries_ast,
+        rules=[r for r in specified_rules if r is not NoUnusedFragmentsRule],
+    )
+    if validation_errors:
+        raise ValueError("\n\n".join(error.message for error in validation_errors))
+    return queries_ast.definitions
+
+
+def generate_result_types(directory: Path, package: PackageGenerator) -> None:
+    for file_name, module in package._result_types_files.items():
+        file_path = directory / file_name
+        code = package._add_comments_to_code(ast_to_str(module), package.queries_source)
+        if package.plugin_manager:
+            code = package.plugin_manager.generate_result_types_code(code)
+        file_path.write_text(code)
+        package._generated_files.append(file_path.name)
 
 
 @app.callback()
@@ -79,7 +109,7 @@ async def generate_return_types(
         gql_per_directory[gql_file.parent].append(gql_file)
 
     # Generate the Pydantic Models for the GraphQL queries
-    for directory in gql_per_directory.keys():
+    for directory, gql_files in gql_per_directory.items():
         package_generator = get_package_generator(
             schema=graphql_schema,
             fragments=[],
@@ -92,13 +122,19 @@ async def generate_return_types(
             plugin_manager=plugin_manager,
         )
 
-        definitions = get_graphql_queries(queries_path=str(directory), schema=graphql_schema)
-        queries = filter_operations_definitions(definitions)
+        for gql_file in gql_files:
+            try:
+                definitions = get_graphql_query(queries_path=gql_file, schema=graphql_schema)
+            except ValueError as e:
+                print(f"Error generating result types for {gql_file}: {e}")
+                continue
+            queries = filter_operations_definitions(definitions)
 
-        for query_operation in queries:
-            package_generator.add_operation(query_operation)
+            for query_operation in queries:
+                package_generator.add_operation(query_operation)
 
-        package_generator._generate_result_types()
+        # package_generator._generate_result_types()
+        generate_result_types(directory=directory, package=package_generator)
 
         for file_name in package_generator._result_types_files.keys():
             print(f"Generated {file_name} in {directory}")