sol2uml 2.5.2 → 2.5.4

package/README.md

@@ -112,6 +112,7 @@ Options:
   -hm, --hideModifiers             hide modifier functions from contracts (default: false)
   -ht, --hideEvents                hide events from contracts, interfaces and libraries (default: false)
   -hc, --hideConstants             hide file level constants (default: false)
+  -hx, --hideContracts             hide contracts (default: false)
   -he, --hideEnums                 hide enum types (default: false)
   -hs, --hideStructs               hide data structures (default: false)
   -hl, --hideLibraries             hide libraries (default: false)

package/lib/converterClass2Dot.d.ts

@@ -1,6 +1,7 @@
 import { UmlClass } from './umlClass';
 export interface ClassOptions {
     hideConstants?: boolean;
+    hideContracts?: boolean;
     hideVariables?: boolean;
     hideFunctions?: boolean;
     hideModifiers?: boolean;

package/lib/filterClasses.js

@@ -22,8 +22,9 @@ const filterHiddenClasses = (umlClasses, options) => {
             !options.hideConstants) ||
         (u.stereotype === umlClass_1.ClassStereotype.Library &&
             !options.hideLibraries) ||
-        u.stereotype === umlClass_1.ClassStereotype.None ||
-        u.stereotype === umlClass_1.ClassStereotype.Contract);
+        ((u.stereotype === umlClass_1.ClassStereotype.None ||
+            u.stereotype === umlClass_1.ClassStereotype.Contract) &&
+            !options.hideContracts));
 };
 exports.filterHiddenClasses = filterHiddenClasses;
 /**

package/lib/parserEtherscan.js

@@ -137,7 +137,7 @@ class EtherscanParser {
             // match whitespace before import
             // and characters after import up to ;
             // replace all in file and match across multiple lines
-            const removedImports = removedPragmaSolidity.replace(/(\s)(import.*;)/gm, '$1/* $2 */');
+            const removedImports = removedPragmaSolidity.replace(/^\s*?(import.*?;)/gms, '/* $1 */');
             // Rename SPDX-License-Identifier to SPDX--License-Identifier so the merged file will compile
             const removedSPDX = removedImports.replace(/SPDX-/, 'SPDX--');
             solidityCode += removedSPDX;

package/lib/sol2uml.js

@@ -63,6 +63,7 @@ program
     .option('-hm, --hideModifiers', 'hide modifier functions from contracts', false)
     .option('-ht, --hideEvents', 'hide events from contracts, interfaces and libraries', false)
     .option('-hc, --hideConstants', 'hide file level constants', false)
+    .option('-hx, --hideContracts', 'hide contracts', false)
     .option('-he, --hideEnums', 'hide enum types', false)
     .option('-hs, --hideStructs', 'hide data structures', false)
     .option('-hl, --hideLibraries', 'hide libraries', false)
@@ -81,9 +82,13 @@ program
         let { umlClasses, contractName } = await (0, parserGeneral_1.parserUmlClasses)(fileFolderAddress, combinedOptions);
         if (options.squash &&
             // Must specify base contract(s) or parse from Etherscan to get contractName
-            !(options.baseContractNames || contractName)) {
+            !options.baseContractNames &&
+            !contractName) {
             throw Error('Must specify base contract(s) when using the squash option against local Solidity files.');
         }
+        if (options.squash && options.hideContracts) {
+            throw Error('Can not hide contracts when squashing contracts.');
+        }
         const baseContractNames = options.baseContractNames?.split(',');
         if (baseContractNames) {
             contractName = baseContractNames[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sol2uml",
-  "version": "2.5.2",
+  "version": "2.5.4",
   "description": "Solidity contract visualisation tool.",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -36,7 +36,7 @@
     "klaw": "^4.1.0"
   },
   "devDependencies": {
-    "@openzeppelin/contracts": "4.8.0",
+    "@openzeppelin/contracts": "^4.8.2",
     "@types/diff-match-patch": "^1.0.32",
     "@types/jest": "^29.4.0",
     "@types/klaw": "^3.0.3",