sol2uml 2.1.9 → 2.2.1

package/lib/converterAST2Classes.js

@@ -158,9 +158,23 @@ function convertAST2UmlClasses(node, relativePath, filesystem = false) {
     else {
         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_1.UmlClass({
+            name: 'Import',
+            stereotype: umlClass_1.ClassStereotype.Import,
+            absolutePath: filesystem
+                ? path.resolve(relativePath) // resolve the absolute path
+                : relativePath,
+            relativePath,
+        });
+        importUmlClass.imports = imports;
+        umlClasses = [importUmlClass];
+    }
     return umlClasses;
 }
 exports.convertAST2UmlClasses = convertAST2UmlClasses;
@@ -265,6 +279,7 @@ function parseContractDefinition(umlClass, node) {
                     stereotype,
                     parameters: parseParameters(subNode.parameters),
                     returnParameters: parseParameters(subNode.returnParameters),
+                    modifiers: subNode.modifiers.map((m) => m.name),
                 });
             }
             // Recursively parse function parameters for associations

package/lib/converterClass2Dot.js

@@ -6,8 +6,9 @@ const umlClass_1 = require("./umlClass");
 const regEx_1 = require("./utils/regEx");
 const convertClass2Dot = (umlClass, options = {}) => {
     // do not include library, interface, abstracts, struct or enum classes if hidden
-    if ((options.hideLibraries &&
-        umlClass.stereotype === umlClass_1.ClassStereotype.Library) ||
+    if (umlClass.stereotype === umlClass_1.ClassStereotype.Import ||
+        (options.hideLibraries &&
+            umlClass.stereotype === umlClass_1.ClassStereotype.Library) ||
         (options.hideInterfaces &&
             umlClass.stereotype === umlClass_1.ClassStereotype.Interface) ||
         (options.hideAbstracts &&
@@ -175,6 +176,9 @@ const dotOperators = (umlClass, vizGroup, operators, options) => {
         if (operator.returnParameters?.length > 0) {
             dotString += ': ' + dotParameters(operator.returnParameters, true);
         }
+        if (options.hideModifiers === false && operator.modifiers?.length > 0) {
+            dotString += ` \\<\\<${operator.modifiers.join(', ')}\\>\\>`;
+        }
         dotString += '\\l';
     }
     return dotString;

package/lib/parserEtherscan.js

@@ -8,6 +8,7 @@ const axios_1 = __importDefault(require("axios"));
 const parser_1 = require("@solidity-parser/parser");
 const converterAST2Classes_1 = require("./converterAST2Classes");
 const filterClasses_1 = require("./filterClasses");
+require('axios-debug-log');
 const debug = require('debug')('sol2uml');
 exports.networks = [
     'mainnet',
@@ -139,6 +140,7 @@ class EtherscanParser {
         // find any files that didn't have dependencies found
         const nonDependentFiles = files.filter((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
         const filenames = [...nonDependentFilenames, ...dependentFilenames];

package/lib/sol2uml.js

@@ -179,7 +179,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');
 });
 const main = async () => {

package/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,
@@ -53,6 +54,7 @@ export interface Operator extends Attribute {
     parameters?: Parameter[];
     returnParameters?: Parameter[];
     isPayable?: boolean;
+    modifiers?: string[];
 }
 export declare enum ReferenceType {
     Memory = 0,

package/lib/umlClass.js

@@ -19,6 +19,7 @@ var ClassStereotype;
     ClassStereotype[ClassStereotype["Struct"] = 5] = "Struct";
     ClassStereotype[ClassStereotype["Enum"] = 6] = "Enum";
     ClassStereotype[ClassStereotype["Constant"] = 7] = "Constant";
+    ClassStereotype[ClassStereotype["Import"] = 8] = "Import";
 })(ClassStereotype = exports.ClassStereotype || (exports.ClassStereotype = {}));
 var OperatorStereotype;
 (function (OperatorStereotype) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sol2uml",
-  "version": "2.1.9",
+  "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",