Merge branch 'main' into fixing-index-create-partially

Author: l-trotta

compiler-rs/clients_schema/src/transform/expand_generics.rs

@@ -211,8 +211,10 @@ pub fn expand(model: IndexedModel, config: ExpandConfig) -> anyhow::Result<Index
 
         expand_behaviors(&mut resp.behaviors, &mappings, model, ctx)?;
         expand_body(&mut resp.body, &mappings, model, ctx)?;
-
-        // TODO: exceptions
+        
+        for exception in &mut resp.exceptions {
+            expand_body(&mut exception.body, &mappings, model, ctx)?;
+        }
 
         Ok(resp.into())
     }

compiler/src/steps/validate-model.ts

@@ -497,6 +497,23 @@ export default async function validateModel (apiModel: model.Model, restSpec: Ma
         // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
         throw new Error(`Unknown kind: ${typeDef.body.kind}`)
     }
+
+    if (typeDef.exceptions != null) {
+      for (const ex of typeDef.exceptions) {
+        switch (ex.body.kind) {
+          case 'properties':
+            validateProperties(ex.body.properties, openGenerics, new Set<string>())
+            break
+          case 'value':
+            validateValueOf(ex.body.value, openGenerics)
+            break
+          case 'no_body':
+            // Nothing to validate
+            break
+        }
+      }
+    }
+
     context.pop()
   }
 

compiler/src/transform/expand-generics.ts

@@ -27,7 +27,7 @@ import {
   Request,
   Response,
   Body,
-  InstanceOf, Inherits, Property
+  InstanceOf, Inherits, Property, ResponseException
 } from '../model/metamodel'
 import { readFile, writeFile } from 'fs/promises'
 import stringify from 'safe-stable-stringify'
@@ -293,6 +293,17 @@ export function expandGenerics (inputModel: Model, config?: ExpansionConfig): Mo
     return addIfNotSeen(resp.name, () => {
       const result = { ...resp }
       result.body = expandBody(resp.body, genericParamMapping(resp.generics, params))
+      if (resp.exceptions != null) {
+        result.exceptions = []
+        for (const exception of resp.exceptions) {
+          const except: ResponseException = {
+            description: exception.description,
+            statusCodes: exception.statusCodes,
+            body: expandBody(exception.body, genericParamMapping(resp.generics, params))
+          }
+          result.exceptions.push(except)
+        }
+      }
       result.generics = undefined
       return result
     })