sol2uml 2.0.0 → 2.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.isElementary = exports.calcStorageByteSize = exports.parseStructStorageObject = exports.convertClasses2StorageObjects = exports.StorageType = void 0;
|
|
4
4
|
const umlClass_1 = require("./umlClass");
|
|
5
|
+
const associations_1 = require("./associations");
|
|
5
6
|
var StorageType;
|
|
6
7
|
(function (StorageType) {
|
|
7
8
|
StorageType[StorageType["Contract"] = 0] = "Contract";
|
|
@@ -45,9 +46,9 @@ const parseStorage = (umlClass, umlClasses, storages, storageObjects, inheritedC
|
|
|
45
46
|
inheritedContracts.push(...newInheritedContracts.map((c) => c.targetUmlClassName));
|
|
46
47
|
// Recursively parse each new inherited contract
|
|
47
48
|
newInheritedContracts.forEach((parent) => {
|
|
48
|
-
const parentClass =
|
|
49
|
+
const parentClass = (0, associations_1.findAssociatedClass)(parent, umlClass, umlClasses);
|
|
49
50
|
if (!parentClass)
|
|
50
|
-
throw Error(`Failed to find parent contract ${parent.targetUmlClassName} of ${umlClass.
|
|
51
|
+
throw Error(`Failed to find parent contract ${parent.targetUmlClassName} of ${umlClass.absolutePath}`);
|
|
51
52
|
// recursively parse inherited contract
|
|
52
53
|
parseStorage(parentClass, umlClasses, storages, storageObjects, inheritedContracts);
|
|
53
54
|
});
|
package/lib/sol2uml.js
CHANGED
|
@@ -101,8 +101,7 @@ program
|
|
|
101
101
|
...options,
|
|
102
102
|
};
|
|
103
103
|
const { umlClasses, contractName } = await (0, parserGeneral_1.parserUmlClasses)(fileFolderAddress, combinedOptions);
|
|
104
|
-
const
|
|
105
|
-
const storageObjects = (0, converterClasses2Storage_1.convertClasses2StorageObjects)(combinedOptions.contractName || contractName, filteredUmlClasses);
|
|
104
|
+
const storageObjects = (0, converterClasses2Storage_1.convertClasses2StorageObjects)(combinedOptions.contractName || contractName, umlClasses);
|
|
106
105
|
if ((0, regEx_1.isAddress)(fileFolderAddress)) {
|
|
107
106
|
// The first object is the contract
|
|
108
107
|
storageObjects[0].address = fileFolderAddress;
|