ts2famix 2.1.0-beta.2 → 3.0.0

package/src/fqn.ts

@@ -1,4 +1,4 @@
-import { ArrowFunction, CallExpression, ClassDeclaration, ConstructorDeclaration, Decorator, EnumDeclaration, FunctionDeclaration, FunctionExpression, GetAccessorDeclaration, Identifier, ImportDeclaration, ImportEqualsDeclaration, InterfaceDeclaration, MethodDeclaration, MethodSignature, ModuleDeclaration, Node, PropertyDeclaration, SetAccessorDeclaration, SourceFile, SyntaxKind, TypeParameterDeclaration, VariableDeclaration } from "ts-morph";
+import { ArrowFunction, CallExpression, ClassDeclaration, ConstructorDeclaration, Decorator, EnumDeclaration, ExpressionWithTypeArguments, FunctionDeclaration, FunctionExpression, GetAccessorDeclaration, Identifier, ImportDeclaration, ImportEqualsDeclaration, InterfaceDeclaration, MethodDeclaration, MethodSignature, ModuleDeclaration, Node, PropertyDeclaration, SetAccessorDeclaration, SourceFile, SyntaxKind, TypeParameterDeclaration, VariableDeclaration } from "ts-morph";
 import { entityDictionary, logger } from "./analyze";
 import path from "path";
 import { TSMorphTypeDeclaration } from "./famix_functions/EntityDictionary";
@@ -10,26 +10,253 @@ function isFQNNode(node: Node): node is FQNNode {
     return Node.isVariableDeclaration(node) || Node.isArrowFunction(node) || Node.isIdentifier(node) || Node.isMethodDeclaration(node) || Node.isClassDeclaration(node) || Node.isClassExpression(node) || Node.isDecorator(node) || Node.isModuleDeclaration(node) || Node.isCallExpression(node);
 }
 
-export function getFQN(node: FQNNode | Node): string {
-    const absolutePathProject = entityDictionary.famixRep.getAbsolutePath();
+/**
+ * Builds a map of method positions to their property keys in object literals.
+ * Scans all variable declarations in a source file, targeting object literals with any keys
+ * (e.g., `3: { method() {} }` or `add: { compute() {} }`), and maps each method's start position to its key.
+ * Logs each step for debugging.
+ * 
+ * @param sourceFile The TypeScript source file to analyze
+ * @returns A Map where keys are method start positions and values are their property keys (e.g., "3", "add")
+ */
+function buildStageMethodMap(sourceFile: SourceFile): Map<number, string> {
+    const stageMap = new Map<number, string>();
+
+    sourceFile.getVariableDeclarations().forEach(varDecl => {
+        // const varName = varDecl.getName();
+        const initializer = varDecl.getInitializer();
+
+        if (!initializer || !Node.isObjectLiteralExpression(initializer)) {
+            return;
+        }
+
+        initializer.getProperties().forEach(prop => {
+            let key: string | undefined;
+
+            if (Node.isPropertyAssignment(prop)) {
+                const nameNode = prop.getNameNode();
+
+                if (Node.isIdentifier(nameNode)) {
+                    key = nameNode.getText();
+                } else if (Node.isStringLiteral(nameNode)) {
+                    key = nameNode.getText().replace(/^"(.+)"$/, '$1').replace(/^'(.+)'$/, '$1');
+                } else if (Node.isNumericLiteral(nameNode)) {
+                    key = nameNode.getText();
+                } else if (Node.isComputedPropertyName(nameNode)) {
+                    const expression = nameNode.getExpression();
+                    if (Node.isIdentifier(expression)) {
+                        // Resolve variable value if possible
+                        const symbol = expression.getSymbol();
+                        if (symbol) {
+                            const decl = symbol.getDeclarations()[0];
+                            if (Node.isVariableDeclaration(decl) && decl.getInitializer()) {
+                                const init = decl.getInitializer()!;
+                                if (Node.isStringLiteral(init) || Node.isNumericLiteral(init)) {
+                                    key = init.getText().replace(/^"(.+)"$/, '$1').replace(/^'(.+)'$/, '$1');
+                                }
+                            }
+                        }
+                        if (!key) {
+                            key = expression.getText();
+                        }
+                    } else if (Node.isBinaryExpression(expression) && expression.getOperatorToken().getText() === '+') {
+                        // Handle simple string concatenation (e.g., "A" + "B")
+                        const left = expression.getLeft();
+                        const right = expression.getRight();
+                        if (Node.isStringLiteral(left) && Node.isStringLiteral(right)) {
+                            key = left.getLiteralText() + right.getLiteralText();
+                        }
+                    } else if (Node.isTemplateExpression(expression)) {
+                        // Handle template literals (e.g., `key-${1}`)
+                        const head = expression.getHead().getLiteralText();
+                        const spans = expression.getTemplateSpans();
+                        if (spans.length === 1 && Node.isNumericLiteral(spans[0].getExpression())) {
+                            const num = spans[0].getExpression().getText();
+                            key = `${head}${num}`;
+                        }
+                    }
+                    if (!key) {
+                        key = expression.getText(); // Fallback
+                    }
+                } else {
+                    return;
+                }
+
+                const propInitializer = prop.getInitializer();
+                if (propInitializer && Node.isObjectLiteralExpression(propInitializer)) {
+                    propInitializer.getDescendantsOfKind(SyntaxKind.MethodDeclaration).forEach(method => {
+                        // const methodName = method.getName();
+                        const pos = method.getStart();
+                        if (key) {
+                            stageMap.set(pos, key);
+                        }
+                    });
+                }
+            }
+        });
+    });
+
+    return stageMap;
+}
+
+/**
+ * Builds a map of method positions to their index in class/interface/namespace declarations
+ * @param sourceFile The TypeScript source file to analyze
+ * @returns A Map where keys are method start positions and values are their positional index (1-based)
+ */
+function buildMethodPositionMap(sourceFile: SourceFile): Map<number, number> {
+    const positionMap = new Map<number, number>();
+    // console.log(`[buildMethodPositionMap] Starting analysis for file: ${sourceFile.getFilePath()}`);
+
+    // Helper function to process modules recursively
+    function processModule(moduleNode: ModuleDeclaration, modulePath: string) {
+        // console.log(`[buildMethodPositionMap] Processing module: ${modulePath}`);
+
+        // Handle functions directly in the module
+        const functions = moduleNode.getFunctions();
+        const functionCounts = new Map<string, number>();
+
+        functions.forEach(func => {
+            const funcName = func.getName() || `Unnamed_Function(${func.getStart()})`;
+            const count = (functionCounts.get(funcName) || 0) + 1;
+            functionCounts.set(funcName, count);
+            positionMap.set(func.getStart(), count);
+            // console.log(`[buildMethodPositionMap] Module function: ${funcName}, position: ${func.getStart()}, index: ${count}`);
+        });
+
+        // Handle classes within the module
+        const classes = moduleNode.getClasses();
+        classes.forEach(classNode => {
+            // console.log(`[buildMethodPositionMap] Processing class in module: ${classNode.getName() || 'Unnamed'}`);
+            const methods = classNode.getMethods();
+            const methodCounts = new Map<string, number>();
+
+            methods.forEach(method => {
+                const methodName = method.getName();
+                const count = (methodCounts.get(methodName) || 0) + 1;
+                methodCounts.set(methodName, count);
+                positionMap.set(method.getStart(), count);
+                // console.log(`[buildMethodPositionMap] Module class method: ${methodName}, position: ${method.getStart()}, index: ${count}`);
+            });
+        });
+
+        // Handle interfaces within the module
+        const interfaces = moduleNode.getInterfaces();
+        interfaces.forEach(interfaceNode => {
+            // console.log(`[buildMethodPositionMap] Processing interface in module: ${interfaceNode.getName() || 'Unnamed'}`);
+            const methods = interfaceNode.getMethods();
+            const methodCounts = new Map<string, number>();
+
+            methods.forEach(method => {
+                const methodName = method.getName();
+                const count = (methodCounts.get(methodName) || 0) + 1;
+                methodCounts.set(methodName, count);
+                positionMap.set(method.getStart(), count);
+                // console.log(`[buildMethodPositionMap] Module interface method: ${methodName}, position: ${method.getStart()}, index: ${count}`);
+            });
+        });
 
+        // Recursively process nested modules
+        const nestedModules = moduleNode.getModules();
+        nestedModules.forEach(nestedModule => {
+            if (Node.isModuleDeclaration(nestedModule)) {
+                const nestedModuleName = nestedModule.getName();
+                const newModulePath = `${modulePath}.${nestedModuleName}`;
+                processModule(nestedModule, newModulePath);
+            }
+        });
+
+    }
+
+    function trackArrowFunctions(container: Node) {
+        const arrows = container.getDescendantsOfKind(SyntaxKind.ArrowFunction);
+        arrows.forEach(arrow => {
+            const parent = arrow.getParent();
+            if (Node.isBlock(parent) || Node.isSourceFile(parent)) {
+                // Use negative numbers for arrow functions to distinguish from methods
+                positionMap.set(arrow.getStart(), -1 * (positionMap.size + 1));
+                // console.log(`[buildMethodPositionMap] Arrow function at ${arrow.getStart()}`);
+            }
+        });
+    }
+
+    // Handle top-level classes
+    sourceFile.getClasses().forEach(classNode => {
+        // console.log(`[buildMethodPositionMap] Processing class: ${classNode.getName() || 'Unnamed'}`);
+        const methods = classNode.getMethods();
+        const methodCounts = new Map<string, number>();
+
+        methods.forEach(method => {
+            const methodName = method.getName();
+            const count = (methodCounts.get(methodName) || 0) + 1;
+            methodCounts.set(methodName, count);
+            positionMap.set(method.getStart(), count);
+            // console.log(`[buildMethodPositionMap] Class method: ${methodName}, position: ${method.getStart()}, index: ${count}`);
+        });
+
+        methods.forEach(method => trackArrowFunctions(method));
+    });
+
+    // Handle top-level interfaces
+    sourceFile.getInterfaces().forEach(interfaceNode => {
+        // console.log(`[buildMethodPositionMap] Processing interface: ${interfaceNode.getName() || 'Unnamed'}`);
+        const methods = interfaceNode.getMethods();
+        const methodCounts = new Map<string, number>();
+
+        methods.forEach(method => {
+            const methodName = method.getName();
+            const count = (methodCounts.get(methodName) || 0) + 1;
+            methodCounts.set(methodName, count);
+            positionMap.set(method.getStart(), count);
+            // console.log(`[buildMethodPositionMap] Interface method: ${methodName}, position: ${method.getStart()}, index: ${count}`);
+        });
+        methods.forEach(method => trackArrowFunctions(method));
+
+    });
+
+    // Handle top-level namespaces/modules
+    sourceFile.getModules().forEach(moduleNode => {
+        if (Node.isModuleDeclaration(moduleNode)) {
+            const moduleName = moduleNode.getName();
+            processModule(moduleNode, moduleName);
+        }
+    });
+
+
+    // console.log(`[buildMethodPositionMap] Final positionMap:`, Array.from(positionMap.entries()));
+    return positionMap;
+}
+
+/**
+ * Generates a fully qualified name (FQN) for a given AST node.
+ * Constructs an FQN by traversing the node's ancestry, adding names and keys
+ * (numeric or string from object literals ...) as needed, prefixed with the file's relative path.
+ * 
+ * @param node The AST node to generate an FQN for
+ * @returns A string representing the node's FQN (e.g., "{path}.operations.add.compute[MethodDeclaration]")
+ */
+export function getFQN(node: FQNNode | Node): string {
     const sourceFile = node.getSourceFile();
+    const absolutePathProject = entityDictionary.famixRep.getAbsolutePath();
     const parts: string[] = [];
     let currentNode: Node | undefined = node;
 
+    const stageMap = buildStageMethodMap(sourceFile);
+    const methodPositionMap = buildMethodPositionMap(sourceFile);
+
     while (currentNode && !Node.isSourceFile(currentNode)) {
         const { line, column } = sourceFile.getLineAndColumnAtPos(currentNode.getStart());
         const lc = `${line}:${column}`;
-        if (Node.isClassDeclaration(currentNode) || 
-            Node.isClassExpression(currentNode) || 
+
+        if (Node.isClassDeclaration(currentNode) ||
+            Node.isClassExpression(currentNode) ||
             Node.isInterfaceDeclaration(currentNode) ||
-            Node.isFunctionDeclaration(currentNode) || 
-            Node.isMethodDeclaration(currentNode) || 
-            Node.isModuleDeclaration(currentNode) || 
-            Node.isVariableDeclaration(currentNode) || 
+            Node.isFunctionDeclaration(currentNode) ||
+            Node.isMethodDeclaration(currentNode) ||
+            Node.isModuleDeclaration(currentNode) ||
+            Node.isVariableDeclaration(currentNode) ||
             Node.isGetAccessorDeclaration(currentNode) ||
             Node.isSetAccessorDeclaration(currentNode) ||
-            Node.isTypeParameterDeclaration(currentNode) ||
             Node.isPropertyDeclaration(currentNode) ||
             Node.isParameterDeclaration(currentNode) ||
             Node.isDecorator(currentNode) ||
@@ -41,44 +268,117 @@ export function getFQN(node: FQNNode | Node): string {
             Node.isArrayLiteralExpression(currentNode) ||
             Node.isImportSpecifier(currentNode) ||
             Node.isIdentifier(currentNode)) {
-            const name = Node.isIdentifier(currentNode) ? currentNode.getText() 
-                : getNameOfNode(currentNode) /* currentNode.getName() */ || 'Unnamed_' + currentNode.getKindName() + `(${lc})`;
+            let name: string;
+            if (Node.isImportSpecifier(currentNode)) {
+                const alias = currentNode.getAliasNode()?.getText();
+                if (alias) {
+                    let importDecl: Node | undefined = currentNode;
+                    while (importDecl && !Node.isImportDeclaration(importDecl)) {
+                        importDecl = importDecl.getParent();
+                    }
+                    const moduleSpecifier = importDecl && Node.isImportDeclaration(importDecl)
+                        ? importDecl.getModuleSpecifier().getLiteralText()
+                        : "unknown";
+                    name = currentNode.getName();
+                    name = `${name} as ${alias}[ImportSpecifier<${moduleSpecifier}>]`;
+                } else {
+                    name = currentNode.getName();
+                }
+            } else {
+                // if constructor, use "constructor" as name
+                if (Node.isConstructorDeclaration(currentNode)) {
+                    name = "constructor";
+                } else {
+                    name = Node.isIdentifier(currentNode) ? currentNode.getText()
+                        : 'getName' in currentNode && typeof currentNode['getName'] === 'function'
+                            ? ((currentNode as { getName(): string }).getName() +
+                                ((Node.isClassDeclaration(currentNode) ||
+                                    Node.isInterfaceDeclaration(currentNode) ||
+                                    Node.isMethodDeclaration(currentNode) ||
+                                    Node.isFunctionDeclaration(currentNode)) &&
+                                    'getTypeParameters' in currentNode &&
+                                    currentNode.getTypeParameters().length > 0
+                                    ? getParameters(currentNode)
+                                    : ''))
+                            : `Unnamed_${currentNode.getKindName()}(${lc})`;
+                }
+            }
+
+            if (Node.isMethodSignature(currentNode)) {
+                const method = currentNode as MethodSignature;
+                const params = method.getParameters().map(p => {
+                    const typeText = p.getType().getText().replace(/\s+/g, "");
+                    return typeText || "any"; // Fallback for untyped parameters
+                });
+                const returnType = method.getReturnType().getText().replace(/\s+/g, "") || "void";
+                name = `${name}(${params.join(",")}):${returnType}`;
+            }
+
+            parts.unshift(name);
+
+            // Apply positional index for MethodDeclaration, MethodSignature, and FunctionDeclaration
+            if (Node.isMethodDeclaration(currentNode) ||
+                Node.isMethodSignature(currentNode) ||
+                Node.isFunctionDeclaration(currentNode)) {
+                const key = stageMap.get(currentNode.getStart());
+                if (key) {
+                    parts.unshift(key);
+                    // console.log(`[getFQN] Applied stageMap key: ${key} for ${currentNode.getKindName()} at position ${currentNode.getStart()}`);
+                } else {
+                    const positionIndex = methodPositionMap.get(currentNode.getStart());
+                    if (positionIndex && positionIndex > 1) {
+                        parts.unshift(positionIndex.toString());
+                        // console.log(`[getFQN] Applied positionIndex: ${positionIndex} for ${currentNode.getKindName()} at position ${currentNode.getStart()}`);
+                    } else {
+                        console.log(`[getFQN] No positionIndex applied for ${currentNode.getKindName()} at position ${currentNode.getStart()}, positionIndex: ${positionIndex || 'none'}`);
+                    }
+                }
+            }
+        }
+        else if (Node.isArrowFunction(currentNode) ||
+            Node.isBlock(currentNode) ||
+            Node.isForInStatement(currentNode) ||
+            Node.isForOfStatement(currentNode) ||
+            Node.isForStatement(currentNode) ||
+            Node.isCatchClause(currentNode)) {
+            const name = `${currentNode.getKindName()}(${lc})`;
             parts.unshift(name);
         }
-        // unnamed nodes
-        else if (Node.isArrowFunction(currentNode) || 
-                   Node.isBlock(currentNode) || 
-                   Node.isForInStatement(currentNode) || 
-                   Node.isForOfStatement(currentNode) || 
-                   Node.isForStatement(currentNode) || 
-                   Node.isCatchClause(currentNode)) {
-            parts.unshift(`${currentNode.getKindName()}(${lc})`);
-        } else if (Node.isConstructorDeclaration(currentNode)) {
-            parts.unshift(`constructor`);
+        else if (Node.isTypeParameterDeclaration(currentNode)) {
+            const arrowParent = currentNode.getFirstAncestorByKind(SyntaxKind.ArrowFunction);
+            if (arrowParent) {
+                const arrowIndex = Math.abs(methodPositionMap.get(arrowParent.getStart()) || 0);
+                if (arrowIndex > 0) {
+                    parts.unshift(arrowIndex.toString());
+                }
+            }
+            parts.unshift(currentNode.getName());
+            // Removed continue to allow ancestor processing
+        }
+        else if (Node.isConstructorDeclaration(currentNode)) {
+            const name = "constructor";
+            parts.unshift(name);
         } else {
-            // For other kinds, you might want to handle them specifically or ignore
-            logger.debug(`Ignoring node kind: ${currentNode.getKindName()}`);
+            console.log(`[getFQN] Ignoring node kind: ${currentNode.getKindName()}`);
         }
+
         currentNode = currentNode.getParent();
     }
 
-
-
-    // Prepend the relative path of the source file
     let relativePath = entityDictionary.convertToRelativePath(
-        path.normalize(sourceFile.getFilePath()), 
-                       absolutePathProject).replace(/\\/sg, "/");
-                       
-    if (relativePath.includes("..")) {
-        logger.error(`Relative path contains ../: ${relativePath}`);
-    }
+        path.normalize(sourceFile.getFilePath()),
+        absolutePathProject
+    ).replace(/\\/g, "/");
+
+    // if (relativePath.includes("..")) {
+    // }
     if (relativePath.startsWith("/")) {
-        relativePath = relativePath.substring(1);
+        relativePath = relativePath.slice(1);
     }
     parts.unshift(`{${relativePath}}`);
-    const fqn = parts.join(".") + `[${node.getKindName()}]`;  // disambiguate
 
-    logger.debug(`Generated FQN: ${fqn} for node: ${node.getKindName()}`);
+    const fqn = parts.join(".") + `[${node.getKindName()}]`;
+    // console.log(`[getFQN] Final FQN: ${fqn}`);
     return fqn;
 }
 
@@ -121,14 +421,14 @@ export function getNameOfNode(a: Node): string {
     let cKind: ClassDeclaration | undefined;
     let iKind: InterfaceDeclaration | undefined;
     let mKind: MethodDeclaration | undefined;
-    let fKind: FunctionDeclaration | undefined; 
+    let fKind: FunctionDeclaration | undefined;
     let alias: TSMorphTypeDeclaration | undefined;
     switch (a.getKind()) {
         case SyntaxKind.SourceFile:
             return a.asKind(SyntaxKind.SourceFile)!.getBaseName();
 
         case SyntaxKind.ModuleDeclaration:
-            return a.asKind(SyntaxKind.ModuleDeclaration)!.getName(); 
+            return a.asKind(SyntaxKind.ModuleDeclaration)!.getName();
 
         case SyntaxKind.ClassDeclaration:
             cKind = a.asKind(SyntaxKind.ClassDeclaration);
@@ -145,13 +445,13 @@ export function getNameOfNode(a: Node): string {
             } else {
                 return iKind?.getName() || "";
             }
-                
+
         case SyntaxKind.PropertyDeclaration:
-            return a.asKind(SyntaxKind.PropertyDeclaration)!.getName();    
+            return a.asKind(SyntaxKind.PropertyDeclaration)!.getName();
 
         case SyntaxKind.PropertySignature:
-            return a.asKind(SyntaxKind.PropertySignature)!.getName();    
-    
+            return a.asKind(SyntaxKind.PropertySignature)!.getName();
+
         case SyntaxKind.MethodDeclaration:
             mKind = a.asKind(SyntaxKind.MethodDeclaration);
             if (mKind && mKind.getTypeParameters().length > 0) {
@@ -161,14 +461,14 @@ export function getNameOfNode(a: Node): string {
             }
 
         case SyntaxKind.MethodSignature:
-            return a.asKind(SyntaxKind.MethodSignature)!.getName();   
+            return a.asKind(SyntaxKind.MethodSignature)!.getName();
 
         case SyntaxKind.GetAccessor:
             return a.asKind(SyntaxKind.GetAccessor)!.getName();
 
         case SyntaxKind.SetAccessor:
             return a.asKind(SyntaxKind.SetAccessor)!.getName();
-    
+
         case SyntaxKind.FunctionDeclaration:
             fKind = a.asKind(SyntaxKind.FunctionDeclaration);
             if (fKind && fKind.getTypeParameters().length > 0) {
@@ -179,15 +479,15 @@ export function getNameOfNode(a: Node): string {
 
         case SyntaxKind.FunctionExpression:
             return a.asKind(SyntaxKind.FunctionExpression)?.getName() || "anonymous";
-            
+
         case SyntaxKind.Parameter:
             return a.asKind(SyntaxKind.Parameter)!.getName();
-                
+
         case SyntaxKind.VariableDeclaration:
             return a.asKind(SyntaxKind.VariableDeclaration)!.getName();
 
         case SyntaxKind.Decorator:
-            return "@" + a.asKind(SyntaxKind.Decorator)!.getName();    
+            return "@" + a.asKind(SyntaxKind.Decorator)!.getName();
 
         case SyntaxKind.TypeParameter:
             return a.asKind(SyntaxKind.TypeParameter)!.getName();
@@ -207,13 +507,13 @@ export function getNameOfNode(a: Node): string {
             return a.asKind(SyntaxKind.TypeAliasDeclaration)!.getName();
 
         case SyntaxKind.Constructor:
-            return "constructor";   
-        
+            return "constructor";
+
         default:
             // throw new Error(`getNameOfNode called on a node that doesn't have a name: ${a.getKindName()}`);
             // ancestor hasn't got a useful name
             return "";
-        }
+    }
 }
 
 /**
@@ -241,3 +541,69 @@ export function getParameters(a: Node): string {
     }
     return paramString;
 }
+
+/**
+ * Gets the FQN of an unresolved interface that is being implemented or extended
+ * @param unresolvedInheritedClassOrInterface The expression with type arguments representing the interface
+ * @returns The FQN of the unresolved interface
+ */
+export function getFQNUnresolvedInheritedClassOrInterface(unresolvedInheritedClassOrInterface: ExpressionWithTypeArguments): string {
+    // Check for either ClassDeclaration or InterfaceDeclaration ancestor
+    const classAncestor = unresolvedInheritedClassOrInterface.getFirstAncestorByKind(SyntaxKind.ClassDeclaration);
+    const interfaceAncestor = unresolvedInheritedClassOrInterface.getFirstAncestorByKind(SyntaxKind.InterfaceDeclaration);
+
+    // Validate the context
+    if (!classAncestor && !interfaceAncestor) {
+        throw new Error("getFQNUnresolvedClassOrInterface called on a node that is not in an implements or extends context");
+    }
+
+    // Check if it's a valid implements/extends context
+    let isValidContext = false;
+
+    let classExtendsClass = false;
+
+    if (classAncestor) {
+        // check if the class is extending or implementing an interface
+        const extendsClause = classAncestor.getExtends();
+        const implementsClause = classAncestor.getImplements();
+        isValidContext = (extendsClause !== undefined) || (implementsClause && implementsClause.length > 0);
+        classExtendsClass = extendsClause !== undefined;
+    } else if (interfaceAncestor) {
+        // Check extends clause for interfaces
+        const extendsClause = interfaceAncestor.getExtends();
+        isValidContext = extendsClause && extendsClause.length > 0;
+    }
+
+    if (!isValidContext) {
+        throw new Error("getFQNUnresolvedInterface called on a node that is not in a valid implements or extends context");
+    }
+
+    // get the name of the interface
+    const name = unresolvedInheritedClassOrInterface.getExpression().getText();
+
+    // Find where it's imported - search the entire source file
+    const sourceFile = unresolvedInheritedClassOrInterface.getSourceFile();
+    const importDecls = sourceFile.getImportDeclarations();
+
+    for (const importDecl of importDecls) {
+        const moduleSpecifier = importDecl.getModuleSpecifierValue();
+        const importClause = importDecl.getImportClause();
+
+        if (importClause) {
+            const namedImports = importClause.getNamedImports();
+            // declarationName is ClassDeclaration if "class extends class"
+            const declarationName = classExtendsClass ? "ClassDeclaration" : "InterfaceDeclaration";
+
+            for (const namedImport of namedImports) {
+                if (namedImport.getName() === name) {
+                    logger.debug(`Found import for ${name} in ${moduleSpecifier}`);
+                    return `{module:${moduleSpecifier}}.${name}[${declarationName}]`;
+                }
+            }
+        }
+    }
+
+    // If not found, return a default FQN format
+    return `{unknown-module}.${name}[InterfaceDeclaration]`;
+}
+

package/src/generate_uml.sh

@@ -1,20 +1,20 @@
-#!/usr/bin/env bash
-# Gets latest plantuml
-rm -f plantuml.jar
-wget --no-verbose https://downloads.sourceforge.net/project/plantuml/plantuml.jar
-# echo the version
-echo "PlantUML version: $(java -jar plantuml.jar -version)"
-echo "tplant version: $(npx tplant --version)"
-# Builds metamodel plantuml from TypeScript sources
-npx tplant -i src/lib/famix/**/*.ts -o doc-metamodel/famix-typescript-model.puml
-sed -i 's/@startuml/& metamodel/' doc-metamodel/famix-typescript-model.puml
-# Converts plantuml source to SVG image
-java -jar plantuml.jar -v -tsvg doc-metamodel/famix-typescript-model.puml
-mv doc-metamodel/metamodel.svg doc-metamodel/metamodel-full.svg
-# Inserts include line to customize the file
-sed -i '/@startuml metamodel/a !include skins.include.puml' doc-metamodel/famix-typescript-model.puml
-# Converts plantuml source to SVG image
-java -jar plantuml.jar -v -tsvg doc-metamodel/famix-typescript-model.puml
-# Moves artifacts
-rm -f doc-uml/*
-mv doc-metamodel/*.svg doc-uml
+#!/usr/bin/env bash
+# Gets latest plantuml
+rm -f plantuml.jar
+wget --no-verbose https://downloads.sourceforge.net/project/plantuml/plantuml.jar
+# echo the version
+echo "PlantUML version: $(java -jar plantuml.jar -version)"
+echo "tplant version: $(npx tplant --version)"
+# Builds metamodel plantuml from TypeScript sources
+npx tplant -i src/lib/famix/**/*.ts -o doc-metamodel/famix-typescript-model.puml
+sed -i 's/@startuml/& metamodel/' doc-metamodel/famix-typescript-model.puml
+# Converts plantuml source to SVG image
+java -jar plantuml.jar -v -tsvg doc-metamodel/famix-typescript-model.puml
+mv doc-metamodel/metamodel.svg doc-metamodel/metamodel-full.svg
+# Inserts include line to customize the file
+sed -i '/@startuml metamodel/a !include skins.include.puml' doc-metamodel/famix-typescript-model.puml
+# Converts plantuml source to SVG image
+java -jar plantuml.jar -v -tsvg doc-metamodel/famix-typescript-model.puml
+# Moves artifacts
+rm -f doc-uml/*
+mv doc-metamodel/*.svg doc-uml

package/src/lib/famix/License.md

@@ -1,23 +1,23 @@
-Portions of the code in the famix directory:
-
-MIT License
-
-Copyright (c) 2019 Pascal Erni
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+Portions of the code in the famix directory:
+
+MIT License
+
+Copyright (c) 2019 Pascal Erni
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.