sol2uml 2.0.0 → 2.0.3

package/README.md

@@ -53,7 +53,7 @@ Options:
   -f, --outputFormat <value>                   output file format. (choices: "svg", "png", "dot", "all", default: "svg")
   -o, --outputFileName <value>                 output file name
   -i, --ignoreFilesOrFolders <filesOrFolders>  comma separated list of files or folders to ignore
-  -n, --network <network>                      Ethereum network (choices: "mainnet", "polygon", "bsc", "arbitrum", "ropsten", "kovan", "rinkeby", "goerli", default: "mainnet")
+  -n, --network <network>                      Ethereum network (choices: "mainnet", "polygon", "bsc", "arbitrum", "ropsten", "kovan", "rinkeby", "goerli", "sepolia", default: "mainnet")
   -k, --apiKey <key>                           Etherscan, Polygonscan or BscScan API key
   -v, --verbose                                run with debugging statements (default: false)
   -h, --help                                   display help for command
@@ -195,7 +195,7 @@ A Solidity variable becomes an attribute in UML and a Solidity function becomes
 
 * event
 * modifier
-* abstract - is 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.
+* 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.
 

package/lib/converterClasses2Storage.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isElementary = exports.calcStorageByteSize = exports.parseStructStorageObject = exports.convertClasses2StorageObjects = exports.StorageType = void 0;
 const umlClass_1 = require("./umlClass");
+const associations_1 = require("./associations");
 var StorageType;
 (function (StorageType) {
     StorageType[StorageType["Contract"] = 0] = "Contract";
@@ -45,9 +46,9 @@ const parseStorage = (umlClass, umlClasses, storages, storageObjects, inheritedC
     inheritedContracts.push(...newInheritedContracts.map((c) => c.targetUmlClassName));
     // Recursively parse each new inherited contract
     newInheritedContracts.forEach((parent) => {
-        const parentClass = umlClasses.find((umlClass) => umlClass.name === parent.targetUmlClassName);
+        const parentClass = (0, associations_1.findAssociatedClass)(parent, umlClass, umlClasses);
         if (!parentClass)
-            throw Error(`Failed to find parent contract ${parent.targetUmlClassName} of ${umlClass.name}`);
+            throw Error(`Failed to find parent contract ${parent.targetUmlClassName} of ${umlClass.absolutePath}`);
         // recursively parse inherited contract
         parseStorage(parentClass, umlClasses, storages, storageObjects, inheritedContracts);
     });

package/lib/parserEtherscan.d.ts

@@ -1,6 +1,6 @@
 import { ASTNode } from '@solidity-parser/parser/dist/src/ast-types';
 import { UmlClass } from './umlClass';
-declare const networks: readonly ["mainnet", "ropsten", "kovan", "rinkeby", "goerli", "polygon", "bsc", "arbitrum"];
+declare const networks: readonly ["mainnet", "ropsten", "kovan", "rinkeby", "goerli", "sepolia", "polygon", "bsc", "arbitrum"];
 declare type Network = typeof networks[number];
 export declare class EtherscanParser {
     protected apikey: string;

package/lib/parserEtherscan.js

@@ -13,6 +13,7 @@ const networks = [
     'kovan',
     'rinkeby',
     'goerli',
+    'sepolia',
     'polygon',
     'bsc',
     'arbitrum',

package/lib/sol2uml.js

@@ -37,6 +37,7 @@ The Solidity code can be pulled from verified source code on Blockchain explorer
     'kovan',
     'rinkeby',
     'goerli',
+    'sepolia',
 ])
     .default('mainnet'))
     .option('-k, --apiKey <key>', 'Etherscan, Polygonscan, BscScan or Arbiscan API key')
@@ -101,8 +102,7 @@ program
             ...options,
         };
         const { umlClasses, contractName } = await (0, parserGeneral_1.parserUmlClasses)(fileFolderAddress, combinedOptions);
-        const filteredUmlClasses = (0, filterClasses_1.classesConnectedToBaseContracts)(umlClasses, [combinedOptions.contractName || contractName]);
-        const storageObjects = (0, converterClasses2Storage_1.convertClasses2StorageObjects)(combinedOptions.contractName || contractName, filteredUmlClasses);
+        const storageObjects = (0, converterClasses2Storage_1.convertClasses2StorageObjects)(combinedOptions.contractName || contractName, umlClasses);
         if ((0, regEx_1.isAddress)(fileFolderAddress)) {
             // The first object is the contract
             storageObjects[0].address = fileFolderAddress;

package/lib/utils/regEx.d.ts

@@ -0,0 +1 @@
+export declare const isAddress: (input: string) => boolean;

package/lib/utils/regEx.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isAddress = void 0;
+const isAddress = (input) => {
+    return input.match(/^0x([A-Fa-f0-9]{40})$/) !== null;
+};
+exports.isAddress = isAddress;
+//# sourceMappingURL=regEx.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sol2uml",
-  "version": "2.0.0",
+  "version": "2.0.3",
   "description": "Unified Modeling Language (UML) class diagram generator for Solidity contracts",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -41,6 +41,8 @@
   "files": [
     "lib/*.js",
     "lib/*.d.ts",
+    "lib/utils/*.js",
+    "lib/utils/*.d.ts",
     "sol2uml"
   ],
   "bin": {