improve code generation

Author: krusche

example/example-openapi.yaml

@@ -1,8 +1,8 @@
-openapi: 3.0.3
+openapi: 3.1.1
 info:
   title: Artemis API
   description: Sample API specification for the Artemis learning platform
-  version: 8.6.4
+  version: 8.7.1
 
 servers:
   - url: /api
@@ -16,6 +16,10 @@ tags:
     description: User management
   - name: participation
     description: Student participation
+  - name: report
+    description: Reporting endpoints
+  - name: admin
+    description: Administrative operations
 
 paths:
   /courses:
@@ -425,6 +429,84 @@ paths:
               schema:
                 $ref: '#/components/schemas/User'
 
+  /reports/summary:
+    get:
+      tags:
+        - report
+      operationId: getReportSummary
+      summary: Get a summary report
+      responses:
+        '200':
+          description: Report summary
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/Course'
+
+  /admin/users:
+    post:
+      tags:
+        - admin
+      operationId: createAdminUser
+      summary: Create a user through admin APIs
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/UserUpdate'
+      responses:
+        '201':
+          description: User created
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/User'
+
+  /admin/users/{userId}:
+    put:
+      tags:
+        - admin
+      operationId: updateAdminUser
+      summary: Update a user through admin APIs
+      parameters:
+        - name: userId
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/UserUpdate'
+      responses:
+        '200':
+          description: User updated
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/User'
+    delete:
+      tags:
+        - admin
+      operationId: deleteAdminUser
+      summary: Delete a user through admin APIs
+      parameters:
+        - name: userId
+          in: path
+          required: true
+          schema:
+            type: integer
+            format: int64
+      responses:
+        '204':
+          description: User deleted
+
 components:
   schemas:
     Course:

src/main/java/de/tum/cit/aet/openapi/Angular21Generator.java

@@ -4,6 +4,8 @@
  */
 package de.tum.cit.aet.openapi;
 
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.Operation;
 import org.openapitools.codegen.*;
 import org.openapitools.codegen.languages.TypeScriptAngularClientCodegen;
 import org.openapitools.codegen.model.ModelMap;
@@ -107,8 +109,6 @@ public void processOpts() {
 
         // Replace base generator supporting files with our template set only.
         supportingFiles.clear();
-        supportingFiles.add(new SupportingFile("index.mustache", "", "index.ts"));
-        supportingFiles.add(new SupportingFile("models-index.mustache", "models", "index.ts"));
 
         // Process custom options
         if (additionalProperties.containsKey(USE_HTTP_RESOURCE)) {
@@ -143,6 +143,43 @@ public void processOpts() {
                 useHttpResource, useInjectFunction, separateResources, readonlyModels);
     }
 
+    @Override
+    public void processOpenAPI(OpenAPI openAPI) {
+        super.processOpenAPI(openAPI);
+
+        if (openapiGeneratorIgnoreList == null) {
+            openapiGeneratorIgnoreList = new HashSet<>();
+        }
+
+        Map<String, TagUsage> usageByTag = new HashMap<>();
+        if (openAPI != null && openAPI.getPaths() != null) {
+            openAPI.getPaths().forEach((path, pathItem) -> {
+                if (pathItem == null) {
+                    return;
+                }
+                addOperationUsage(pathItem.getGet(), true, usageByTag);
+                addOperationUsage(pathItem.getPost(), false, usageByTag);
+                addOperationUsage(pathItem.getPut(), false, usageByTag);
+                addOperationUsage(pathItem.getDelete(), false, usageByTag);
+                addOperationUsage(pathItem.getPatch(), false, usageByTag);
+                addOperationUsage(pathItem.getHead(), false, usageByTag);
+                addOperationUsage(pathItem.getOptions(), false, usageByTag);
+                addOperationUsage(pathItem.getTrace(), false, usageByTag);
+            });
+        }
+
+        for (Map.Entry<String, TagUsage> entry : usageByTag.entrySet()) {
+            String apiFilename = toApiFilename(entry.getKey());
+            TagUsage usage = entry.getValue();
+            if (!usage.hasMutation) {
+                openapiGeneratorIgnoreList.add("api/" + apiFilename + "-api.ts");
+            }
+            if (useHttpResource && separateResources && !usage.hasGet) {
+                openapiGeneratorIgnoreList.add("api/" + apiFilename + "-resources.ts");
+            }
+        }
+    }
+
     @Override
     public String toModelFilename(String name) {
         // Use kebab-case for filenames without .model suffix (new Angular style guide)
@@ -160,6 +197,42 @@ public String toApiName(String name) {
         return StringUtils.camelize(name) + "Api";
     }
 
+    @Override
+    public String toOperationId(String operationId) {
+        String name = super.toOperationId(operationId);
+        String normalized = name.replaceFirst("^_+", "");
+        normalized = normalized.replaceFirst("\\d+$", "");
+        if (normalized.isBlank()) {
+            normalized = "operation";
+        }
+        return normalized;
+    }
+
+    private void addOperationUsage(Operation operation, boolean isGet, Map<String, TagUsage> usageByTag) {
+        if (operation == null) {
+            return;
+        }
+
+        List<String> tags = operation.getTags();
+        if (tags == null || tags.isEmpty()) {
+            tags = Collections.singletonList("default");
+        }
+        for (String tag : tags) {
+            String sanitizedTag = sanitizeTag(tag);
+            TagUsage usage = usageByTag.computeIfAbsent(sanitizedTag, key -> new TagUsage());
+            if (isGet) {
+                usage.hasGet = true;
+            } else {
+                usage.hasMutation = true;
+            }
+        }
+    }
+
+    private static final class TagUsage {
+        private boolean hasGet;
+        private boolean hasMutation;
+    }
+
     @Override
     public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs) {
         Map<String, ModelsMap> result = super.postProcessAllModels(objs);

src/main/resources/angular21/index.mustache

@@ -1,7 +1,10 @@
 {{>licenseInfo}}
-
 {{#models}}
 {{#model}}
+{{#tsImports}}
+import type { {{classname}} } from '{{filename}}';
+{{/tsImports}}
+
 {{#description}}
 /**
  * {{{.}}}