sol2uml 2.0.3 → 2.0.4

package/README.md

@@ -20,16 +20,19 @@ The following installation assumes [Node.js](https://nodejs.org/en/download/) ha
 `sol2uml` works with node 14 or above.
 
 To install globally so you can run `sol2uml` from anywhere
+
 ```bash
 npm link sol2uml --only=production
 ```
 
 To upgrade run
+
 ```bash
 npm upgrade sol2uml -g
 ```
 
 To see which version you are using
+
 ```bash
 npm ls sol2uml -g
 ```
@@ -139,36 +142,43 @@ Options:
 ## UML Class diagram examples
 
 To generate a diagram of all contracts under the contracts folder and its sub folders
+
 ```bash
 sol2uml class ./contracts
 ```
 
 To generate a diagram of EtherDelta's contract from the verified source code on [Etherscan](https://etherscan.io/address/0x8d12A197cB00D4747a1fe03395095ce2A5CC6819#code). The output wil be a svg file `0x8d12A197cB00D4747a1fe03395095ce2A5CC6819.svg` in the working folder.
+
 ```bash
 sol2uml class 0x8d12A197cB00D4747a1fe03395095ce2A5CC6819
 ```
 
 To generate a diagram of EtherDelta's contract from the verified source code on [Etherscan Ropsten](https://ropsten.etherscan.io/address/0xa19833bd291b66aB0E17b9C6d46D2Ec5fEC15190#code). The output wil be a svg file `0xa19833bd291b66aB0E17b9C6d46D2Ec5fEC15190.svg` in the working folder.
+
 ```bash
 sol2uml class 0xa19833bd291b66aB0E17b9C6d46D2Ec5fEC15190 -n ropsten
 ```
 
 To generate all Solidity files under some root folder and output the svg file to a specific location
+
 ```bash
 sol2uml class path/to/contracts/root/folder -o ./outputFile.svg
 ```
 
 To generate a diagram of all contracts in a single Solidity file, the output file in png format to output file `./someFile.png`
+
 ```bash
 sol2uml class path/to/contracts/root/folder/solidity/file.sol -f png -o ./someFile.png
 ```
 
-To generate a diagram of all Solidity files under the `contracts` and `node_modules/openzeppelin-solidity` folders.  The output will be `contracts.svg` and `contracts.png` files in the working folder.
+To generate a diagram of all Solidity files under the `contracts` and `node_modules/openzeppelin-solidity` folders. The output will be `contracts.svg` and `contracts.png` files in the working folder.
+
 ```bash
 sol2uml class ./contracts,node_modules/openzeppelin-solidity -f all -v
 ```
 
 To generate a diagram of all Solidity files under the working folder ignoring and files under the `solparse`, `@solidity-parser` and `ethlint` folders, which will be under the `node_modules` folder.
+
 ```bash
 sol2uml class -i solparse,@solidity-parser,ethlint
 ```
@@ -176,8 +186,9 @@ sol2uml class -i solparse,@solidity-parser,ethlint
 # UML Class Diagram Syntax
 
 Good online resources for learning UML
-* [UML 2 Class Diagramming Guidelines](http://www.agilemodeling.com/style/classDiagram.htm)
-* [Creating class diagrams with UML](https://www.ionos.com/digitalguide/websites/web-development/class-diagrams-with-uml/)
+
+-   [UML 2 Class Diagramming Guidelines](http://www.agilemodeling.com/style/classDiagram.htm)
+-   [Creating class diagrams with UML](https://www.ionos.com/digitalguide/websites/web-development/class-diagrams-with-uml/)
 
 ## Terminology differences
 
@@ -187,33 +198,35 @@ A Solidity variable becomes an attribute in UML and a Solidity function becomes
 
 ### Class stereotypes
 
-* Interface
-* Abstract - if any of the contract's functions are abstract, the class will have an Abstract stereotype. Child contracts of abstract contracts that do not implement all the abstract functions are currently not marked as Abstract.
-* Library
+-   Interface
+-   Abstract - if any of the contract's functions are abstract, the class will have an Abstract stereotype. Child contracts of abstract contracts that do not implement all the abstract functions are currently not marked as Abstract.
+-   Library
 
 ### Operator stereotypes
 
-* event
-* modifier
-* abstract - if there is no function body on a contract, the operator is marked as abstract. Operators on an Interface do not have an abstract stereotype as all operators are abstract.
-* fallback - abstract fallback functions will just have an abstract stereotype.
-* payable - payable fallback functions will just have a fallback stereotype.
+-   event
+-   modifier
+-   abstract - if there is no function body on a contract, the operator is marked as abstract. Operators on an Interface do not have an abstract stereotype as all operators are abstract.
+-   fallback - abstract fallback functions will just have an abstract stereotype.
+-   payable - payable fallback functions will just have a fallback stereotype.
 
 ## UML Associations
 
 Lines:
-- Solid lines for
-    - link the contract types of storage (state) variables. This can be linked to contracts, interfaces, libraries or file level structs and enums.
-    - generalisations of contracts and abstract contracts.
-    - aggregated contract level structs and enums.
-- Dashed lines for
-    - generalisations of interfaces.
-    - types of memory variables.
+
+-   Solid lines for
+    -   link the contract types of storage (state) variables. This can be linked to contracts, interfaces, libraries or file level structs and enums.
+    -   generalisations of contracts and abstract contracts.
+    -   aggregated contract level structs and enums.
+-   Dashed lines for
+    -   generalisations of interfaces.
+    -   types of memory variables.
 
 Heads/Tails:
-- An empty triangle head for generalisations of contracts, interfaces and abstract contracts.
-- An open arrow head for storage or memory variable dependencies
-- A diamond tail for aggregations of contract level structs and enums
+
+-   An empty triangle head for generalisations of contracts, interfaces and abstract contracts.
+-   An open arrow head for storage or memory variable dependencies
+-   A diamond tail for aggregations of contract level structs and enums
 
 ## Storage diagram
 

package/lib/sol2uml.js

@@ -101,15 +101,16 @@ program
             ...command.parent._optionValues,
             ...options,
         };
-        const { umlClasses, contractName } = await (0, parserGeneral_1.parserUmlClasses)(fileFolderAddress, combinedOptions);
-        const storageObjects = (0, converterClasses2Storage_1.convertClasses2StorageObjects)(combinedOptions.contractName || contractName, umlClasses);
+        let { umlClasses, contractName } = await (0, parserGeneral_1.parserUmlClasses)(fileFolderAddress, combinedOptions);
+        contractName = combinedOptions.contractName || contractName;
+        const storageObjects = (0, converterClasses2Storage_1.convertClasses2StorageObjects)(contractName, umlClasses);
         if ((0, regEx_1.isAddress)(fileFolderAddress)) {
             // The first object is the contract
             storageObjects[0].address = fileFolderAddress;
         }
         debug(storageObjects);
         const dotString = (0, converterStorage2Dot_1.convertStorage2Dot)(storageObjects);
-        await (0, writerFiles_1.writeOutputFiles)(dotString, fileFolderAddress, combinedOptions.outputFormat, combinedOptions.outputFileName);
+        await (0, writerFiles_1.writeOutputFiles)(dotString, fileFolderAddress, contractName, combinedOptions.outputFormat, combinedOptions.outputFileName);
     }
     catch (err) {
         console.error(`Failed to generate storage diagram ${err}`);

package/lib/writerFiles.d.ts

@@ -1,5 +1,5 @@
 export declare type OutputFormats = 'svg' | 'png' | 'dot' | 'all';
-export declare const writeOutputFiles: (dot: string, outputBaseName: string, outputFormat?: OutputFormats, outputFilename?: string) => Promise<void>;
+export declare const writeOutputFiles: (dot: string, fileFolderAddress: string, contractName: string, outputFormat?: OutputFormats, outputFilename?: string) => Promise<void>;
 export declare function convertDot2Svg(dot: string): any;
 export declare function writeSolidity(code: string, filename?: string): void;
 export declare function writeDot(dot: string, filename?: string): void;

package/lib/writerFiles.js

@@ -9,7 +9,7 @@ const path_1 = __importDefault(require("path"));
 const sync_1 = __importDefault(require("@aduh95/viz.js/sync"));
 const { convert } = require('convert-svg-to-png');
 const debug = require('debug')('sol2uml');
-const writeOutputFiles = async (dot, outputBaseName, outputFormat = 'svg', outputFilename) => {
+const writeOutputFiles = async (dot, fileFolderAddress, contractName, outputFormat = 'svg', outputFilename) => {
     if (outputFormat === 'dot' || outputFormat === 'all') {
         writeDot(dot, outputFilename);
         // No need to continue if only generating a dot file
@@ -17,19 +17,24 @@ const writeOutputFiles = async (dot, outputBaseName, outputFormat = 'svg', outpu
             return;
         }
     }
+    // If all output then extension is svg
+    const outputExt = outputFormat === 'all' ? 'svg' : outputFormat;
     if (!outputFilename) {
-        // If all output then extension is svg
-        const outputExt = outputFormat === 'all' ? 'svg' : outputFormat;
-        // if outputBaseName is a folder
+        outputFilename =
+            path_1.default.join(process.cwd(), contractName) + '.' + outputExt;
+    }
+    else {
+        // check if outputFilename is a folder
         try {
-            const folderOrFile = (0, fs_1.lstatSync)(outputBaseName);
+            const folderOrFile = (0, fs_1.lstatSync)(outputFilename);
             if (folderOrFile.isDirectory()) {
-                const parsedDir = path_1.default.parse(process.cwd());
-                outputBaseName = path_1.default.join(process.cwd(), parsedDir.name);
+                outputFilename =
+                    path_1.default.join(process.cwd(), outputFilename, contractName) +
+                        '.' +
+                        outputExt;
             }
         }
-        catch (err) { } // we can ignore errors as it just means outputBaseName is not a folder
-        outputFilename = outputBaseName + '.' + outputExt;
+        catch (err) { } // we can ignore errors as it just means outputFilename does not exist yet
     }
     const svg = convertDot2Svg(dot);
     if (outputFormat === 'svg' || outputFormat === 'all') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sol2uml",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "Unified Modeling Language (UML) class diagram generator for Solidity contracts",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -8,8 +8,8 @@
     "buildSol": "cd ./src/contracts && solc **/*.sol",
     "build": "tsc --build ./tsconfig.json",
     "clean": "tsc --build --clean ./tsconfig.json",
-    "prettier": "prettier --write \"src/**/*.ts\"",
-    "prettier:check": "prettier --check \"src/**/*.ts\"",
+    "prettier": "prettier --write src/**/*.ts **/*.md",
+    "prettier:check": "prettier --check src/**/*.ts  **/*.md",
     "test": "npx jest"
   },
   "preferGlobal": true,
@@ -25,6 +25,7 @@
     "commander": "^9.4.0",
     "convert-svg-to-png": "^0.6.4",
     "debug": "^4.3.4",
+    "ethers": "^5.6.9",
     "js-graph-algorithms": "^1.0.18",
     "klaw": "^4.0.1"
   },