fix: issue 102. dependencies broken when import in file has no other …

…UML classes

chore: imported logging of axios calls

lib/umlClass.d.ts

@@ -13,7 +13,8 @@ export declare enum ClassStereotype {
     Contract = 4,
     Struct = 5,
     Enum = 6,
-    Constant = 7
+    Constant = 7,
+    Import = 8
 }
 export declare enum OperatorStereotype {
     None = 0,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sol2uml",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Solidity contract visualisation tool.",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -22,6 +22,7 @@
     "@aduh95/viz.js": "^3.7.0",
     "@solidity-parser/parser": "^0.14.3",
     "axios": "^0.27.2",
+    "axios-debug-log": "^0.8.4",
     "commander": "^9.4.0",
     "convert-svg-to-png": "^0.6.4",
     "debug": "^4.3.4",

src/ts/converterAST2Classes.ts

@@ -189,9 +189,22 @@ export function convertAST2UmlClasses(
         throw new Error(`AST node not of type SourceUnit`)
     }
 
-    umlClasses.forEach((umlClass) => {
-        umlClass.imports = imports
-    })
+    if (umlClasses.length > 0) {
+        umlClasses.forEach((umlClass) => {
+            umlClass.imports = imports
+        })
+    } else {
+        const importUmlClass = new UmlClass({
+            name: 'Import',
+            stereotype: ClassStereotype.Import,
+            absolutePath: filesystem
+                ? path.resolve(relativePath) // resolve the absolute path
+                : relativePath, // from Etherscan so don't resolve
+            relativePath,
+        })
+        importUmlClass.imports = imports
+        umlClasses = [importUmlClass]
+    }
 
     return umlClasses
 }

src/ts/converterClass2Dot.ts

@@ -31,6 +31,7 @@ export const convertClass2Dot = (
 ): string => {
     // do not include library, interface, abstracts, struct or enum classes if hidden
     if (
+        umlClass.stereotype === ClassStereotype.Import ||
         (options.hideLibraries &&
             umlClass.stereotype === ClassStereotype.Library) ||
         (options.hideInterfaces &&

src/ts/parserEtherscan.ts

@@ -6,6 +6,7 @@ import { convertAST2UmlClasses } from './converterAST2Classes'
 import { UmlClass } from './umlClass'
 import { topologicalSortClasses } from './filterClasses'
 
+require('axios-debug-log')
 const debug = require('debug')('sol2uml')
 
 export const networks = <const>[
@@ -150,6 +151,7 @@ export class EtherscanParser {
             (f) => !dependentFilenames.includes(f.filename)
         )
         const nonDependentFilenames = nonDependentFiles.map((f) => f.filename)
+        debug(`Failed to find dependencies to files: ${nonDependentFilenames}`)
 
         let solidityCode = ''
         // output non dependent code before the dependent files just in case sol2uml missed some dependencies

src/ts/sol2uml.ts

@@ -341,7 +341,7 @@ In order for the merged code to compile, the following is done:
     })
 
 program.on('option:verbose', () => {
-    debugControl.enable('sol2uml')
+    debugControl.enable('sol2uml,axios')
     debug('verbose on')
 })
 

src/ts/umlClass.ts

@@ -15,6 +15,7 @@ export enum ClassStereotype {
     Struct,
     Enum,
     Constant,
+    Import,
 }
 
 export enum OperatorStereotype {