Attach generic type parameters to the declaring type

elastic · Jun 18, 2024 · 380fbd2 · 380fbd2
1 parent f3591e2
commit 380fbd2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/compiler/src/model/build-model.ts b/compiler/src/model/build-model.ts
@@ -444,7 +444,7 @@ function compileClassOrInterfaceDeclaration (declaration: ClassDeclaration | Int
     for (const typeParameter of declaration.getTypeParameters()) {
       type.generics = (type.generics ?? []).concat({
         name: modelGenerics(typeParameter),
-        namespace: type.name.namespace
+        namespace: type.name.namespace + '.' + type.name.name 
       })
     }
 
@@ -532,7 +532,7 @@ function compileClassOrInterfaceDeclaration (declaration: ClassDeclaration | Int
     for (const typeParameter of declaration.getTypeParameters()) {
       type.generics = (type.generics ?? []).concat({
         name: modelGenerics(typeParameter),
-        namespace: type.name.namespace
+        namespace: type.name.namespace + '.' + type.name.name 
       })
     }
 

diff --git a/compiler/src/model/utils.ts b/compiler/src/model/utils.ts
@@ -343,6 +343,20 @@ export function modelType (node: Node): model.ValueOf {
               namespace: getNameSpace(node)
             }
           }
+
+          if (Node.isTypeParameterDeclaration(declaration)) {
+            const parent = declaration.getParent();
+            assert(
+                parent,
+                Node.isClassDeclaration(parent) ||
+                Node.isInterfaceDeclaration(parent) ||
+                Node.isTypeAliasDeclaration(parent),
+                'It should be a class, interface, enum, type alias, or type parameter declaration'
+            )
+
+            type.type.namespace += '.' + parent.getName() as string;
+          }
+
           return type
         }
       }
@@ -475,9 +489,10 @@ export function modelEnumDeclaration (declaration: EnumDeclaration): model.Enum
 export function modelTypeAlias (declaration: TypeAliasDeclaration): model.TypeAlias {
   const type = declaration.getTypeNode()
   assert(declaration, type != null, 'Type alias without a referenced type')
+
   const generics = declaration.getTypeParameters().map(typeParameter => ({
     name: modelGenerics(typeParameter),
-    namespace: getNameSpace(typeParameter)
+    namespace: getNameSpace(typeParameter) + '.' + declaration.getName() as string
   }))
 
   const alias = modelType(type)