improved stability when parsing barrel files

Author: timonkrebs

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsharp/ng-component-hierarchy-visualizer",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "generate mermaid representations of your angular component hierarchy",
   "keywords": [
     "angular",

scripts/component.helper.js

@@ -94,7 +94,7 @@ const handleLoadChildren = (route) => {
     } else {
         // Check if routes are configured directly (convention: .+\/.+routing.*|.+routes)
         const moduleImportMatch = routesFileContent.match(/(import|export)\s+\{?[^}]+\}?\s+from\s+'(.+\/.*routing.*|.+routes)'/);
-        const originalModulePath = moduleImportMatch[2];
+        const originalModulePath = moduleImportMatch?.[2] ?? routesFileContent.match(/(import|export)\s+\{?[^}]+\}?\s+from\s+'(.+\/.*)'/)[2];
         const resolvedModulePath = replacePath(originalModulePath);
 
         const moduleFilePath = originalModulePath === resolvedModulePath

scripts/route.helper.js

@@ -115,11 +115,7 @@ export const extractRoutesFromTS = (routesString, rootName = ROOT_COMPONENT) =>
         }
 
         try {
-            const resolvedRoutes = extractRoutes(routesArrayNodes, rootName)
-            if (resolvedRoutes.length === 1) {
-                return resolvedRoutes[0];
-            }
-
+            const resolvedRoutes = extractRoutes(routesArrayNodes, rootName);
             return resolvedRoutes;
         } catch (error) {
             console.error('Error extracting route configuration:', error);

scripts/template.helper.js

@@ -35,7 +35,7 @@ const loadDependencies = (c, withNestedDependencies, recursionDepth) => {
     const importNodes = parse(fileContent, { range: true }).body
         .filter(n => (n.type === 'ExportDefaultDeclaration' || n.type === 'ExportNamedDeclaration') && n.declaration?.decorators)?.flatMap(n => n
             .declaration.decorators.filter(d => d.expression.callee?.name === 'Component')?.[0]
-            .expression.arguments[0].properties.filter(n => n.key.name === 'imports')?.[0]
+            ?.expression.arguments[0].properties.filter(n => n.key.name === 'imports')?.[0]
             ?.value.elements);
 
     // ToDo: add tests for this