occam-verify-cli 0.0.1007 → 0.0.1010

package/lib/verify/release.js

@@ -8,12 +8,6 @@ Object.defineProperty(exports, "default", {
         return verifyRelease;
     }
 });
-var _files = /*#__PURE__*/ _interop_require_default(require("../verify/files"));
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
 function verifyRelease(releaseName, dependentName, dependentReleased, releaseContextMap) {
     var releaseVerified = false;
     var releaseContext = releaseContextMap[releaseName];
@@ -27,31 +21,22 @@ function verifyRelease(releaseName, dependentName, dependentReleased, releaseCon
             } else {
                 var _$dependentName = releaseName, _$dependentReleased = released, dependencyReleasesVVerified = verifyDependencyReleases(releaseContext, _$dependentName, _$dependentReleased, releaseContextMap);
                 if (dependencyReleasesVVerified) {
-                    var verified = releaseContext.isVerified();
-                    if (verified) {
-                        releaseVerified = true;
-                    } else {
+                    var releaseContextVerified;
+                    releaseContextVerified = releaseContext.isVerified();
+                    if (!releaseContextVerified) {
                         releaseContext.info("Verifying the '".concat(releaseName, "' project..."));
-                        var releaseFilesVerified = verifyReleaseFiles(releaseContext);
-                        if (releaseFilesVerified) {
-                            var verified1 = true;
-                            releaseContext.setVerified(verified1);
-                            releaseVerified = verified1; ///
-                        }
-                        if (releaseVerified) {
+                        releaseContextVerified = releaseContext.verify();
+                        if (releaseContextVerified) {
                             releaseContext.info("...verified the '".concat(releaseName, "' project."));
                         }
                     }
+                    releaseVerified = releaseContextVerified; ///
                 }
             }
         }
     }
     return releaseVerified;
 }
-function verifyReleaseFiles(releaseContext) {
-    var filesVerified = (0, _files.default)(releaseContext), releaseFilesVerified = filesVerified; ///
-    return releaseFilesVerified;
-}
 function verifyDependencyReleases(releaseContext, dependentName, dependentReleased, releaseContextMap) {
     var dependencies = releaseContext.getDependencies(), dependencyReleasesVVerified = dependencies.everyDependency(function(dependency) {
         var name = dependency.getName(), releaseName = name, releaseVerified = verifyRelease(releaseName, dependentName, dependentReleased, releaseContextMap);
@@ -62,4 +47,4 @@ function verifyDependencyReleases(releaseContext, dependentName, dependentReleas
     return dependencyReleasesVVerified;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvcmVsZWFzZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHZlcmlmeUZpbGVzIGZyb20gXCIuLi92ZXJpZnkvZmlsZXNcIjtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5UmVsZWFzZShyZWxlYXNlTmFtZSwgZGVwZW5kZW50TmFtZSwgZGVwZW5kZW50UmVsZWFzZWQsIHJlbGVhc2VDb250ZXh0TWFwKSB7XG4gIGxldCByZWxlYXNlVmVyaWZpZWQgPSBmYWxzZTtcblxuICBjb25zdCByZWxlYXNlQ29udGV4dCA9IHJlbGVhc2VDb250ZXh0TWFwW3JlbGVhc2VOYW1lXTtcblxuICBpZiAocmVsZWFzZUNvbnRleHQgIT09IG51bGwpIHtcbiAgICBjb25zdCByZWxlYXNlZCA9IHJlbGVhc2VDb250ZXh0LmlzUmVsZWFzZWQoKTtcblxuICAgIGlmIChyZWxlYXNlZCkge1xuICAgICAgcmVsZWFzZVZlcmlmaWVkID0gdHJ1ZTtcbiAgICB9IGVsc2Uge1xuICAgICAgaWYgKGRlcGVuZGVudFJlbGVhc2VkKSB7XG4gICAgICAgIHJlbGVhc2VDb250ZXh0Lndhcm5pbmcoYFRoZSAnJHtyZWxlYXNlTmFtZX0nIHByb2plY3QgY2Fubm90IGJlIHZlcmlmaWVkIGJlY2F1c2UgaXRzICcke2RlcGVuZGVudE5hbWV9JyBkZXBlbmRlbnQgaXMgYSBwYWNrYWdlLmApO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgY29uc3QgZGVwZW5kZW50TmFtZSA9IHJlbGVhc2VOYW1lLCAgLy8vXG4gICAgICAgICAgICAgIGRlcGVuZGVudFJlbGVhc2VkID0gcmVsZWFzZWQsIC8vL1xuICAgICAgICAgICAgICBkZXBlbmRlbmN5UmVsZWFzZXNWVmVyaWZpZWQgPSB2ZXJpZnlEZXBlbmRlbmN5UmVsZWFzZXMocmVsZWFzZUNvbnRleHQsIGRlcGVuZGVudE5hbWUsIGRlcGVuZGVudFJlbGVhc2VkLCByZWxlYXNlQ29udGV4dE1hcCk7XG5cbiAgICAgICAgaWYgKGRlcGVuZGVuY3lSZWxlYXNlc1ZWZXJpZmllZCkge1xuICAgICAgICAgIGNvbnN0IHZlcmlmaWVkID0gcmVsZWFzZUNvbnRleHQuaXNWZXJpZmllZCgpO1xuXG4gICAgICAgICAgaWYgKHZlcmlmaWVkKSB7XG4gICAgICAgICAgICByZWxlYXNlVmVyaWZpZWQgPSB0cnVlO1xuICAgICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgICByZWxlYXNlQ29udGV4dC5pbmZvKGBWZXJpZnlpbmcgdGhlICcke3JlbGVhc2VOYW1lfScgcHJvamVjdC4uLmApO1xuXG4gICAgICAgICAgICBjb25zdCByZWxlYXNlRmlsZXNWZXJpZmllZCA9IHZlcmlmeVJlbGVhc2VGaWxlcyhyZWxlYXNlQ29udGV4dCk7XG5cbiAgICAgICAgICAgIGlmIChyZWxlYXNlRmlsZXNWZXJpZmllZCkge1xuICAgICAgICAgICAgICBjb25zdCB2ZXJpZmllZCA9IHRydWU7XG5cbiAgICAgICAgICAgICAgcmVsZWFzZUNvbnRleHQuc2V0VmVyaWZpZWQodmVyaWZpZWQpO1xuXG4gICAgICAgICAgICAgIHJlbGVhc2VWZXJpZmllZCA9IHZlcmlmaWVkOyAvLy9cbiAgICAgICAgICAgIH1cblxuICAgICAgICAgICAgaWYgKHJlbGVhc2VWZXJpZmllZCkge1xuICAgICAgICAgICAgICByZWxlYXNlQ29udGV4dC5pbmZvKGAuLi52ZXJpZmllZCB0aGUgJyR7cmVsZWFzZU5hbWV9JyBwcm9qZWN0LmApO1xuICAgICAgICAgICAgfVxuICAgICAgICAgIH1cbiAgICAgICAgfVxuICAgICAgfVxuICAgIH1cbiAgfVxuXG4gIHJldHVybiByZWxlYXNlVmVyaWZpZWQ7XG59XG5cbmZ1bmN0aW9uIHZlcmlmeVJlbGVhc2VGaWxlcyhyZWxlYXNlQ29udGV4dCkge1xuICBjb25zdCBmaWxlc1ZlcmlmaWVkID0gdmVyaWZ5RmlsZXMocmVsZWFzZUNvbnRleHQpLFxuICAgICAgICByZWxlYXNlRmlsZXNWZXJpZmllZCA9IGZpbGVzVmVyaWZpZWQ7IC8vL1xuXG4gIHJldHVybiByZWxlYXNlRmlsZXNWZXJpZmllZDtcbn1cblxuZnVuY3Rpb24gdmVyaWZ5RGVwZW5kZW5jeVJlbGVhc2VzKHJlbGVhc2VDb250ZXh0LCBkZXBlbmRlbnROYW1lLCBkZXBlbmRlbnRSZWxlYXNlZCwgcmVsZWFzZUNvbnRleHRNYXApIHtcbiAgY29uc3QgZGVwZW5kZW5jaWVzID0gcmVsZWFzZUNvbnRleHQuZ2V0RGVwZW5kZW5jaWVzKCksXG4gICAgICAgIGRlcGVuZGVuY3lSZWxlYXNlc1ZWZXJpZmllZCA9IGRlcGVuZGVuY2llcy5ldmVyeURlcGVuZGVuY3koKGRlcGVuZGVuY3kpID0+IHtcbiAgICAgICAgICBjb25zdCBuYW1lID0gZGVwZW5kZW5jeS5nZXROYW1lKCksXG4gICAgICAgICAgICAgICAgcmVsZWFzZU5hbWUgPSBuYW1lLCAvLy9cbiAgICAgICAgICAgICAgICByZWxlYXNlVmVyaWZpZWQgPSB2ZXJpZnlSZWxlYXNlKHJlbGVhc2VOYW1lLCBkZXBlbmRlbnROYW1lLCBkZXBlbmRlbnRSZWxlYXNlZCwgcmVsZWFzZUNvbnRleHRNYXApO1xuXG4gICAgICAgICAgaWYgKHJlbGVhc2VWZXJpZmllZCkge1xuICAgICAgICAgICAgcmV0dXJuIHRydWU7XG4gICAgICAgICAgfVxuICAgICAgICB9KTtcblxuICByZXR1cm4gZGVwZW5kZW5jeVJlbGVhc2VzVlZlcmlmaWVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeVJlbGVhc2UiLCJyZWxlYXNlTmFtZSIsImRlcGVuZGVudE5hbWUiLCJkZXBlbmRlbnRSZWxlYXNlZCIsInJlbGVhc2VDb250ZXh0TWFwIiwicmVsZWFzZVZlcmlmaWVkIiwicmVsZWFzZUNvbnRleHQiLCJyZWxlYXNlZCIsImlzUmVsZWFzZWQiLCJ3YXJuaW5nIiwiZGVwZW5kZW5jeVJlbGVhc2VzVlZlcmlmaWVkIiwidmVyaWZ5RGVwZW5kZW5jeVJlbGVhc2VzIiwidmVyaWZpZWQiLCJpc1ZlcmlmaWVkIiwiaW5mbyIsInJlbGVhc2VGaWxlc1ZlcmlmaWVkIiwidmVyaWZ5UmVsZWFzZUZpbGVzIiwic2V0VmVyaWZpZWQiLCJmaWxlc1ZlcmlmaWVkIiwidmVyaWZ5RmlsZXMiLCJkZXBlbmRlbmNpZXMiLCJnZXREZXBlbmRlbmNpZXMiLCJldmVyeURlcGVuZGVuY3kiLCJkZXBlbmRlbmN5IiwibmFtZSIsImdldE5hbWUiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQUlBOzs7ZUFBd0JBOzs7NERBRkE7Ozs7OztBQUVULFNBQVNBLGNBQWNDLFdBQVcsRUFBRUMsYUFBYSxFQUFFQyxpQkFBaUIsRUFBRUMsaUJBQWlCO0lBQ3BHLElBQUlDLGtCQUFrQjtJQUV0QixJQUFNQyxpQkFBaUJGLGlCQUFpQixDQUFDSCxZQUFZO0lBRXJELElBQUlLLG1CQUFtQixNQUFNO1FBQzNCLElBQU1DLFdBQVdELGVBQWVFLFVBQVU7UUFFMUMsSUFBSUQsVUFBVTtZQUNaRixrQkFBa0I7UUFDcEIsT0FBTztZQUNMLElBQUlGLG1CQUFtQjtnQkFDckJHLGVBQWVHLE9BQU8sQ0FBQyxBQUFDLFFBQStEUCxPQUF4REQsYUFBWSw4Q0FBMEQsT0FBZEMsZUFBYztZQUN2RyxPQUFPO2dCQUNMLElBQU1BLGtCQUFnQkQsYUFDaEJFLHNCQUFvQkksVUFDcEJHLDhCQUE4QkMseUJBQXlCTCxnQkFBZ0JKLGlCQUFlQyxxQkFBbUJDO2dCQUUvRyxJQUFJTSw2QkFBNkI7b0JBQy9CLElBQU1FLFdBQVdOLGVBQWVPLFVBQVU7b0JBRTFDLElBQUlELFVBQVU7d0JBQ1pQLGtCQUFrQjtvQkFDcEIsT0FBTzt3QkFDTEMsZUFBZVEsSUFBSSxDQUFDLEFBQUMsa0JBQTZCLE9BQVpiLGFBQVk7d0JBRWxELElBQU1jLHVCQUF1QkMsbUJBQW1CVjt3QkFFaEQsSUFBSVMsc0JBQXNCOzRCQUN4QixJQUFNSCxZQUFXOzRCQUVqQk4sZUFBZVcsV0FBVyxDQUFDTDs0QkFFM0JQLGtCQUFrQk8sV0FBVSxHQUFHO3dCQUNqQzt3QkFFQSxJQUFJUCxpQkFBaUI7NEJBQ25CQyxlQUFlUSxJQUFJLENBQUMsQUFBQyxvQkFBK0IsT0FBWmIsYUFBWTt3QkFDdEQ7b0JBQ0Y7Z0JBQ0Y7WUFDRjtRQUNGO0lBQ0Y7SUFFQSxPQUFPSTtBQUNUO0FBRUEsU0FBU1csbUJBQW1CVixjQUFjO0lBQ3hDLElBQU1ZLGdCQUFnQkMsSUFBQUEsY0FBVyxFQUFDYixpQkFDNUJTLHVCQUF1QkcsZUFBZSxHQUFHO0lBRS9DLE9BQU9IO0FBQ1Q7QUFFQSxTQUFTSix5QkFBeUJMLGNBQWMsRUFBRUosYUFBYSxFQUFFQyxpQkFBaUIsRUFBRUMsaUJBQWlCO0lBQ25HLElBQU1nQixlQUFlZCxlQUFlZSxlQUFlLElBQzdDWCw4QkFBOEJVLGFBQWFFLGVBQWUsQ0FBQyxTQUFDQztRQUMxRCxJQUFNQyxPQUFPRCxXQUFXRSxPQUFPLElBQ3pCeEIsY0FBY3VCLE1BQ2RuQixrQkFBa0JMLGNBQWNDLGFBQWFDLGVBQWVDLG1CQUFtQkM7UUFFckYsSUFBSUMsaUJBQWlCO1lBQ25CLE9BQU87UUFDVDtJQUNGO0lBRU4sT0FBT0s7QUFDVCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvcmVsZWFzZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5UmVsZWFzZShyZWxlYXNlTmFtZSwgZGVwZW5kZW50TmFtZSwgZGVwZW5kZW50UmVsZWFzZWQsIHJlbGVhc2VDb250ZXh0TWFwKSB7XG4gIGxldCByZWxlYXNlVmVyaWZpZWQgPSBmYWxzZTtcblxuICBjb25zdCByZWxlYXNlQ29udGV4dCA9IHJlbGVhc2VDb250ZXh0TWFwW3JlbGVhc2VOYW1lXTtcblxuICBpZiAocmVsZWFzZUNvbnRleHQgIT09IG51bGwpIHtcbiAgICBjb25zdCByZWxlYXNlZCA9IHJlbGVhc2VDb250ZXh0LmlzUmVsZWFzZWQoKTtcblxuICAgIGlmIChyZWxlYXNlZCkge1xuICAgICAgcmVsZWFzZVZlcmlmaWVkID0gdHJ1ZTtcbiAgICB9IGVsc2Uge1xuICAgICAgaWYgKGRlcGVuZGVudFJlbGVhc2VkKSB7XG4gICAgICAgIHJlbGVhc2VDb250ZXh0Lndhcm5pbmcoYFRoZSAnJHtyZWxlYXNlTmFtZX0nIHByb2plY3QgY2Fubm90IGJlIHZlcmlmaWVkIGJlY2F1c2UgaXRzICcke2RlcGVuZGVudE5hbWV9JyBkZXBlbmRlbnQgaXMgYSBwYWNrYWdlLmApO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgY29uc3QgZGVwZW5kZW50TmFtZSA9IHJlbGVhc2VOYW1lLCAgLy8vXG4gICAgICAgICAgICAgIGRlcGVuZGVudFJlbGVhc2VkID0gcmVsZWFzZWQsIC8vL1xuICAgICAgICAgICAgICBkZXBlbmRlbmN5UmVsZWFzZXNWVmVyaWZpZWQgPSB2ZXJpZnlEZXBlbmRlbmN5UmVsZWFzZXMocmVsZWFzZUNvbnRleHQsIGRlcGVuZGVudE5hbWUsIGRlcGVuZGVudFJlbGVhc2VkLCByZWxlYXNlQ29udGV4dE1hcCk7XG5cbiAgICAgICAgaWYgKGRlcGVuZGVuY3lSZWxlYXNlc1ZWZXJpZmllZCkge1xuICAgICAgICAgIGxldCByZWxlYXNlQ29udGV4dFZlcmlmaWVkO1xuXG4gICAgICAgICAgcmVsZWFzZUNvbnRleHRWZXJpZmllZCA9IHJlbGVhc2VDb250ZXh0LmlzVmVyaWZpZWQoKTtcblxuICAgICAgICAgIGlmICghcmVsZWFzZUNvbnRleHRWZXJpZmllZCkge1xuICAgICAgICAgICAgcmVsZWFzZUNvbnRleHQuaW5mbyhgVmVyaWZ5aW5nIHRoZSAnJHtyZWxlYXNlTmFtZX0nIHByb2plY3QuLi5gKTtcblxuICAgICAgICAgICAgcmVsZWFzZUNvbnRleHRWZXJpZmllZCA9IHJlbGVhc2VDb250ZXh0LnZlcmlmeSgpO1xuXG4gICAgICAgICAgICBpZiAocmVsZWFzZUNvbnRleHRWZXJpZmllZCkge1xuICAgICAgICAgICAgICByZWxlYXNlQ29udGV4dC5pbmZvKGAuLi52ZXJpZmllZCB0aGUgJyR7cmVsZWFzZU5hbWV9JyBwcm9qZWN0LmApO1xuICAgICAgICAgICAgfVxuICAgICAgICAgIH1cblxuICAgICAgICAgIHJlbGVhc2VWZXJpZmllZCA9IHJlbGVhc2VDb250ZXh0VmVyaWZpZWQ7IC8vL1xuICAgICAgICB9XG4gICAgICB9XG4gICAgfVxuICB9XG5cbiAgcmV0dXJuIHJlbGVhc2VWZXJpZmllZDtcbn1cblxuZnVuY3Rpb24gdmVyaWZ5RGVwZW5kZW5jeVJlbGVhc2VzKHJlbGVhc2VDb250ZXh0LCBkZXBlbmRlbnROYW1lLCBkZXBlbmRlbnRSZWxlYXNlZCwgcmVsZWFzZUNvbnRleHRNYXApIHtcbiAgY29uc3QgZGVwZW5kZW5jaWVzID0gcmVsZWFzZUNvbnRleHQuZ2V0RGVwZW5kZW5jaWVzKCksXG4gICAgICAgIGRlcGVuZGVuY3lSZWxlYXNlc1ZWZXJpZmllZCA9IGRlcGVuZGVuY2llcy5ldmVyeURlcGVuZGVuY3koKGRlcGVuZGVuY3kpID0+IHtcbiAgICAgICAgICBjb25zdCBuYW1lID0gZGVwZW5kZW5jeS5nZXROYW1lKCksXG4gICAgICAgICAgICAgICAgcmVsZWFzZU5hbWUgPSBuYW1lLCAvLy9cbiAgICAgICAgICAgICAgICByZWxlYXNlVmVyaWZpZWQgPSB2ZXJpZnlSZWxlYXNlKHJlbGVhc2VOYW1lLCBkZXBlbmRlbnROYW1lLCBkZXBlbmRlbnRSZWxlYXNlZCwgcmVsZWFzZUNvbnRleHRNYXApO1xuXG4gICAgICAgICAgaWYgKHJlbGVhc2VWZXJpZmllZCkge1xuICAgICAgICAgICAgcmV0dXJuIHRydWU7XG4gICAgICAgICAgfVxuICAgICAgICB9KTtcblxuICByZXR1cm4gZGVwZW5kZW5jeVJlbGVhc2VzVlZlcmlmaWVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeVJlbGVhc2UiLCJyZWxlYXNlTmFtZSIsImRlcGVuZGVudE5hbWUiLCJkZXBlbmRlbnRSZWxlYXNlZCIsInJlbGVhc2VDb250ZXh0TWFwIiwicmVsZWFzZVZlcmlmaWVkIiwicmVsZWFzZUNvbnRleHQiLCJyZWxlYXNlZCIsImlzUmVsZWFzZWQiLCJ3YXJuaW5nIiwiZGVwZW5kZW5jeVJlbGVhc2VzVlZlcmlmaWVkIiwidmVyaWZ5RGVwZW5kZW5jeVJlbGVhc2VzIiwicmVsZWFzZUNvbnRleHRWZXJpZmllZCIsImlzVmVyaWZpZWQiLCJpbmZvIiwidmVyaWZ5IiwiZGVwZW5kZW5jaWVzIiwiZ2V0RGVwZW5kZW5jaWVzIiwiZXZlcnlEZXBlbmRlbmN5IiwiZGVwZW5kZW5jeSIsIm5hbWUiLCJnZXROYW1lIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFFQTs7O2VBQXdCQTs7O0FBQVQsU0FBU0EsY0FBY0MsV0FBVyxFQUFFQyxhQUFhLEVBQUVDLGlCQUFpQixFQUFFQyxpQkFBaUI7SUFDcEcsSUFBSUMsa0JBQWtCO0lBRXRCLElBQU1DLGlCQUFpQkYsaUJBQWlCLENBQUNILFlBQVk7SUFFckQsSUFBSUssbUJBQW1CLE1BQU07UUFDM0IsSUFBTUMsV0FBV0QsZUFBZUUsVUFBVTtRQUUxQyxJQUFJRCxVQUFVO1lBQ1pGLGtCQUFrQjtRQUNwQixPQUFPO1lBQ0wsSUFBSUYsbUJBQW1CO2dCQUNyQkcsZUFBZUcsT0FBTyxDQUFDLEFBQUMsUUFBK0RQLE9BQXhERCxhQUFZLDhDQUEwRCxPQUFkQyxlQUFjO1lBQ3ZHLE9BQU87Z0JBQ0wsSUFBTUEsa0JBQWdCRCxhQUNoQkUsc0JBQW9CSSxVQUNwQkcsOEJBQThCQyx5QkFBeUJMLGdCQUFnQkosaUJBQWVDLHFCQUFtQkM7Z0JBRS9HLElBQUlNLDZCQUE2QjtvQkFDL0IsSUFBSUU7b0JBRUpBLHlCQUF5Qk4sZUFBZU8sVUFBVTtvQkFFbEQsSUFBSSxDQUFDRCx3QkFBd0I7d0JBQzNCTixlQUFlUSxJQUFJLENBQUMsQUFBQyxrQkFBNkIsT0FBWmIsYUFBWTt3QkFFbERXLHlCQUF5Qk4sZUFBZVMsTUFBTTt3QkFFOUMsSUFBSUgsd0JBQXdCOzRCQUMxQk4sZUFBZVEsSUFBSSxDQUFDLEFBQUMsb0JBQStCLE9BQVpiLGFBQVk7d0JBQ3REO29CQUNGO29CQUVBSSxrQkFBa0JPLHdCQUF3QixHQUFHO2dCQUMvQztZQUNGO1FBQ0Y7SUFDRjtJQUVBLE9BQU9QO0FBQ1Q7QUFFQSxTQUFTTSx5QkFBeUJMLGNBQWMsRUFBRUosYUFBYSxFQUFFQyxpQkFBaUIsRUFBRUMsaUJBQWlCO0lBQ25HLElBQU1ZLGVBQWVWLGVBQWVXLGVBQWUsSUFDN0NQLDhCQUE4Qk0sYUFBYUUsZUFBZSxDQUFDLFNBQUNDO1FBQzFELElBQU1DLE9BQU9ELFdBQVdFLE9BQU8sSUFDekJwQixjQUFjbUIsTUFDZGYsa0JBQWtCTCxjQUFjQyxhQUFhQyxlQUFlQyxtQkFBbUJDO1FBRXJGLElBQUlDLGlCQUFpQjtZQUNuQixPQUFPO1FBQ1Q7SUFDRjtJQUVOLE9BQU9LO0FBQ1QifQ==

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "0.0.1007",
+  "version": "0.0.1010",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",

package/src/argument.js

@@ -0,0 +1,79 @@
+"use strict";
+
+import { nodeQuery } from "./utilities/query";
+
+const termNodeQuery = nodeQuery("/argument/term"),
+      typeNodeQuery = nodeQuery("/argument//type");
+
+export default class Argument {
+  constructor(string, node, fileContext) {
+    this.string = string;
+    this.node = node;
+    this.fileContext = fileContext;
+  }
+
+  getString() {
+    return this.string;
+  }
+
+  getNode() {
+    return this.node;
+  }
+
+  getFileContext() {
+    return this.fileContext;
+  }
+
+  verify(fileContext) {
+    let verified = false;
+
+    const argumentString = this.string; ///
+
+    fileContext.trace(`Verifying the '${argumentString}' argument...`);
+
+    if (this.node === null) {
+      verified = true;
+    } else {
+      const termNode = termNodeQuery(this.node);
+
+      if (termNode !== null) {
+        const termString = this.fileContext.nodeAsString(termNode);
+
+        this.fileContext.debug(`The '${termString}' term was found when a type should have been present.`);
+      } else {
+        const typeNode = typeNodeQuery(this.node);
+
+        if (typeNode !== null) {
+          const typePresent = this.fileContext.isTypePresentByTypeNode(typeNode);
+
+          if (typePresent) {
+            verified = true;
+          } else {
+            const typeString = this.fileContext.nodeAsString(typeNode);
+
+            this.fileContext.debug(`The '${typeString}' type is not present.`);
+          }
+        }
+      }
+    }
+
+    if (verified) {
+      fileContext.debug(`...verified the '${argumentString}' argument.`);
+    }
+
+    return verified;
+  }
+
+  static fromArgumentNode(argumentNode, fileContext) {
+    let argument = null;
+
+    if (argumentNode !== null) {
+      const node = argumentNode,  ///
+            string = fileContext.nodeAsString(node);
+
+      argument = new Argument(string, node, fileContext);
+    }
+
+    return argument;
+  }
+}

package/src/combinator.js

@@ -5,7 +5,6 @@ import Statement from "./statement";
 import LocalContext from "./context/local";
 
 import { nodeQuery } from "./utilities/query";
-import { statementNodeFromStatementString } from "./utilities/node";
 
 const statementNodeQuery = nodeQuery("/combinatorDeclaration/statement");
 
@@ -47,13 +46,13 @@ export default class Combinator {
   static fromJSON(json, fileContext) {
     let { statement } = json;
 
-    const lexer = fileContext.getLexer(),
-          parser = fileContext.getParser(),
-          statementString = statement,  ///
-          statementNode = statementNodeFromStatementString(statementString, lexer, parser),
-          localContext = LocalContext.fromFileContext(fileContext);
+    const string = statement;  ///
 
-    statement = Statement.fromStatementNode(statementNode, localContext);
+    json = {  ///
+      string
+    };
+
+    statement = Statement.fromJSON(json, fileContext);
 
     const combinator = new Combinator(statement);
 

package/src/conclusion.js

@@ -6,7 +6,6 @@ import UnqualifiedStatement from "./statement/unqualified";
 
 import { trim } from "./utilities/string";
 import { nodeQuery } from "./utilities/query";
-import { unqualifiedStatementNodeFromUnqualifiedStatementString } from "./utilities/node";
 
 const unqualifiedStatementNodeQuery = nodeQuery("/conclusion/unqualifiedStatement");
 
@@ -80,8 +79,8 @@ export default class Conclusion {
   }
 
   toJSON() {
-    const unqualifiedStatementString = this.unqualifiedStatement.getString(),
-          unqualifiedStatement = unqualifiedStatementString,  ///
+    const unqualifiedStatementJSON = this.unqualifiedStatement.toJSON(),
+          unqualifiedStatement = unqualifiedStatementJSON,  ///
           json = {
             unqualifiedStatement
           };
@@ -92,17 +91,15 @@ export default class Conclusion {
   static fromJSON(json, fileContext) {
     let { unqualifiedStatement } = json;
 
-    const lexer = fileContext.getLexer(),
-          parser = fileContext.getParser(),
-          unqualifiedStatementString = unqualifiedStatement,  ///
-          unqualifiedStatementNode = unqualifiedStatementNodeFromUnqualifiedStatementString(unqualifiedStatementString, lexer, parser);
+    json = unqualifiedStatement;  ///
 
-    unqualifiedStatement = UnqualifiedStatement.fromUnqualifiedStatementNode(unqualifiedStatementNode, fileContext);
+    unqualifiedStatement = UnqualifiedStatement.fromJSON(json, fileContext);
 
     const conclusion = new Conclusion(fileContext, unqualifiedStatement);
 
     return conclusion;
   }
+
   static fromConclusionNode(conclusionNode, fileContext) {
     const unqualifiedStatementNode = unqualifiedStatementNodeQuery(conclusionNode),
           unqualifiedStatement = UnqualifiedStatement.fromUnqualifiedStatementNode(unqualifiedStatementNode, fileContext),

package/src/context/release.js

@@ -470,7 +470,7 @@ export default class ReleaseContext {
           parser = null,
           verified = false,
           initialised = false,
-          fileContexts = null,
+          fileContexts = [],
           customGrammar = customGrammarFromNameAndEntries(name, entries),
           dependencyReleaseContexts = null,
           releaseContext = new ReleaseContext(log, name, json, entries, lexer, parser, verified, initialised, fileContexts, customGrammar, dependencyReleaseContexts);

package/src/declaration/combinator.js

@@ -3,33 +3,38 @@
 import Combinator from "../combinator";
 
 export default class CombinatorDeclaration {
-  constructor(combinator) {
+  constructor(fileContext, combinator) {
+    this.fileContext = fileContext;
     this.combinator = combinator;
   }
 
+  getFileContext() {
+    return this.fileContext;
+  }
+
   getCombinator() {
     return this.combinator;
   }
 
   getString() { return this.combinator.getString(); }
 
-  verify(fileContext) {
+  verify() {
     let verified;
 
-    const ocmbinatorDeclarationString = this.getString(); ///
+    const combinatorDeclarationString = this.getString(); ///
 
-    fileContext.trace(`Verifying the '${ocmbinatorDeclarationString}' combinator declaration...`);
+    this.fileContext.trace(`Verifying the '${combinatorDeclarationString}' combinator declaration...`);
 
-    const combinatorVerified = this.combinator.verify(fileContext);
+    const combinatorVerified = this.combinator.verify(this.fileContext);
 
     if (combinatorVerified) {
-      fileContext.addCombinator(this.combinator);
+      this.fileContext.addCombinator(this.combinator);
 
       verified = true;
     }
 
     if (verified) {
-      fileContext.debug(`...verified the '${ocmbinatorDeclarationString}' combinator declaration.`);
+      this.fileContext.debug(`...verified the '${combinatorDeclarationString}' combinator declaration.`);
     }
 
     return verified;
@@ -37,7 +42,7 @@ export default class CombinatorDeclaration {
 
   static fromCombinatorDeclarationNode(combinatorDeclarationNode, fileContext) {
     const combinator = Combinator.fromCombinatorDeclarationNode(combinatorDeclarationNode, fileContext),
-          combinatorDeclaration = new CombinatorDeclaration(combinator);
+          combinatorDeclaration = new CombinatorDeclaration(fileContext, combinator);
 
     return combinatorDeclaration;
   }

package/src/declaration/metavariable.js

@@ -0,0 +1,57 @@
+"use strict";
+
+import MetaType from "../metaType";
+import Metavariable from "../metavariable";
+
+import { nodeQuery } from "../utilities/query";
+
+const metaTypeNodeQuery = nodeQuery("/metavariableDeclaration/metaType");
+
+export default class MetavariableDeclaration {
+  constructor(string, metavariable) {
+    this.string = string;
+    this.metavariable = metavariable;
+  }
+
+  getString() {
+    return this.string;
+  }
+
+  getMetavariable() {
+    return this.metavariable;
+  }
+
+  verify(fileContext) {
+    let verified;
+
+    const metavariableDeclarationString = this.string; ///
+
+    fileContext.trace(`Verifying the '${metavariableDeclarationString}' metavariable declaration...`);
+
+    const metavariableVerified = this.metavariable.verify(fileContext);
+
+    if (metavariableVerified) {
+      fileContext.addMetavariable(this.metavariable);
+
+      verified = true;
+    }
+
+    if (verified) {
+      fileContext.debug(`...verified the '${metavariableDeclarationString}' metavariable declaration.`);
+    }
+
+    return verified;
+  }
+
+  static fromMetavariableDeclarationNode(metavariableDeclarationNode, fileContext) {
+    const metaTypeNode = metaTypeNodeQuery(metavariableDeclarationNode),
+          metaType = MetaType.fromMetaTypeNode(metaTypeNode, fileContext),
+          metavariable = Metavariable.fromMetavariableDeclarationNode(metavariableDeclarationNode, fileContext),
+          metavariableString = metavariable.getString(),
+          metaTypeString = metaType.getString(),
+          string = `${metavariableString}:${metaTypeString}`,
+          metavariableDeclaration = new MetavariableDeclaration(string, metavariable);
+
+    return metavariableDeclaration;
+  }
+}

package/src/metaType.js

@@ -13,6 +13,12 @@ class MetaType {
     return this.name;
   }
 
+  getString() {
+    const string = this.name; ///
+
+    return string;
+  }
+
   isEqualTo(metaType) {
     const equalTo = (this === metaType);
 
@@ -69,15 +75,3 @@ Object.assign(shim, {
 });
 
 export default MetaType;
-
-export function metaTypeFromJSON(json, fileContext) {
-  let metaType = null;
-
-  if (json !== null) {
-    const { name } = json;
-
-    metaType = new MetaType(name);
-  }
-
-  return metaType;
-}

package/src/metavariable.js

@@ -1,9 +1,17 @@
 "use strict";
 
-import { metaTypeFromJSON } from "./metaType";
+import Argument from "./argument";
+import MetaType from "./metaType";
+import LocalContext from "./context/local";
+
+import { nodeQuery } from "./utilities/query";
 import { metavariableNameFromMetavariableNode } from "./utilities/name";
 import { metavariableNodeFromMetavariableString } from "./utilities/node";
 
+const argumentNodeQuery = nodeQuery("/metavariable/argument"),
+      metaTypeNodeQuery = nodeQuery("/metavariableDeclaration/metaType"),
+      metavariableNodeQuery = nodeQuery("/metavariableDeclaration/metavariable");
+
 export default class Metavariable {
   constructor(string, node, name, metaType) {
     this.string = string;
@@ -46,6 +54,40 @@ export default class Metavariable {
     return metavariableNodeMatches;
   }
 
+  verify(fileContext) {
+    let metavariableVerified = false;
+
+    const metavariableString = this.string; ///
+
+    fileContext.trace(`Verifying the '${metavariableString}' metavariable...`);
+
+    const metavariableNode = this.node, ///
+          metavariablePresent = fileContext.isMetavariablePresentByMetavariableNode(metavariableNode);
+
+    if (metavariablePresent) {
+      fileContext.debug(`The metavariable '${metavariableString}' is already present.`);
+    } else {
+      const argumentNode = argumentNodeQuery(metavariableNode),
+            argument = Argument.fromArgumentNode(argumentNode, fileContext);
+
+      if (argument === null) {
+        metavariableVerified = true;
+      } else {
+        const argumentVerified = argument.verify(fileContext);
+
+        if (argumentVerified) {
+          metavariableVerified = true;
+        }
+      }
+    }
+
+    if (metavariableVerified) {
+      fileContext.debug(`...verified the '${metavariableString}' metavariable.`);
+    }
+
+    return metavariableVerified;
+  }
+
   toJSON() {
     const metaTypeJSON = (this.metaType !== null) ?
                             this.metaType.toJSON() :
@@ -70,9 +112,11 @@ export default class Metavariable {
 
     let { metaType } = json;
 
-    json = metaType;  ///
+    if (metaType !== null) {
+      json = metaType;  ///
 
-    metaType = metaTypeFromJSON(json, fileContext);
+      metaType = MetaType.fromJSON(json, fileContext);
+    }
 
     const metavariableName = metavariableNameFromMetavariableNode(metavariableNode),
           name = metavariableName,  ///
@@ -83,8 +127,8 @@ export default class Metavariable {
 
   static fromMetavariableNode(metavariableNode, fileContext) {
     const metavariableName = metavariableNameFromMetavariableNode(metavariableNode),
-          name = metavariableName,  ///
           node = metavariableNode,  ///
+          name = metavariableName,  ///
           string = fileContext.nodeAsString(node),
           metaType = null,
           metavariable = new Metavariable(string, node, name, metaType);
@@ -94,11 +138,26 @@ export default class Metavariable {
 
   static fromMetavariableNodeAndMetaType(metavariableNode, metaType, fileContext) {
     const metavariableName = metavariableNameFromMetavariableNode(metavariableNode),
-          name = metavariableName,  ///
           node = metavariableNode,  ///
+          name = metavariableName,  ///
           string = fileContext.nodeAsString(node),
           metavariable = new Metavariable(string, node, name, metaType);
 
     return metavariable;
   }
+
+  static fromMetavariableDeclarationNode(metavariableDeclarationNode, fileContext) {
+    const metaTypeNode = metaTypeNodeQuery(metavariableDeclarationNode),
+          metavariableNode = metavariableNodeQuery(metavariableDeclarationNode),
+          metavariableName = metavariableNameFromMetavariableNode(metavariableNode),
+          localContext = LocalContext.fromFileContext(fileContext),
+          metavariableString = fileContext.nodeAsString(metavariableNode),
+          string = metavariableString,  ///
+          node = metavariableNode,  ///
+          name = metavariableName,  ///
+          metaType = MetaType.fromMetaTypeNode(metaTypeNode, localContext),
+          metavariable = new Metavariable(string, node, name, metaType);
+
+    return metavariable;
+  }
 }

package/src/premise.js

@@ -143,8 +143,8 @@ export default class Premise {
   }
 
   toJSON() {
-    const unqualifiedStatementString = this.unqualifiedStatement.getString(),
-          unqualifiedStatement = unqualifiedStatementString,  ///
+    const unqualifiedStatementJSON = this.unqualifiedStatement.toJSON(),
+          unqualifiedStatement = unqualifiedStatementJSON,  ///
           json = {
             unqualifiedStatement
           };
@@ -155,12 +155,9 @@ export default class Premise {
   static fromJSON(json, fileContext) {
     let { unqualifiedStatement } = json;
 
-    const lexer = fileContext.getLexer(),
-          parser = fileContext.getParser(),
-          unqualifiedStatementString = unqualifiedStatement,  ///
-          unqualifiedStatementNode = unqualifiedStatementNodeFromUnqualifiedStatementString(unqualifiedStatementString, lexer, parser);
+    json = unqualifiedStatement;  ///
 
-    unqualifiedStatement = UnqualifiedStatement.fromUnqualifiedStatementNode(unqualifiedStatementNode, fileContext);
+    unqualifiedStatement = UnqualifiedStatement.fromJSON(json, fileContext);
 
     const premise = new Premise(fileContext, unqualifiedStatement);
 

package/src/statement/qualified.js

@@ -36,7 +36,7 @@ export default class QualifiedStatement {
   verify(substitutions, localContext) {
     let verified;
 
-    const qualifiedStatementString = trim(this.string); ///
+    const qualifiedStatementString = this.string; ///
 
     localContext.trace(`Verifying the '${qualifiedStatementString}' qualified statement...`);
 
@@ -89,12 +89,10 @@ export default class QualifiedStatement {
       const statementNode = statementNodeQuery(qualifiedStatementNode),
             referenceNode = referenceNodeQuery(qualifiedStatementNode),
             localContext = LocalContext.fromFileContext(fileContext),
-            statement = (statementNode !== null) ?
-                          Statement.fromStatementNode(statementNode, localContext) :
-                            null,
+            statement = Statement.fromStatementNode(statementNode, localContext),
             reference = Reference.fromReferenceNode(referenceNode, fileContext),
             node = qualifiedStatementNode,  ///
-            string = fileContext.nodeAsString(node);
+            string = trim(fileContext.nodeAsString(node));  ///
 
         qualifiedStatement = new QualifiedStatement(string, statement, reference);
     }

package/src/statement/unqualified.js

@@ -3,29 +3,25 @@
 import Statement from "../statement";
 import LocalContext from "../context/local";
 
-import { trim } from "../utilities/string";
 import { nodeQuery } from "../utilities/query";
 
 const statementNodeQuery = nodeQuery("/unqualifiedStatement/statement");
 
 export default class UnqualifiedStatement {
-  constructor(string, statement) {
-    this.string = string;
+  constructor(statement) {
     this.statement = statement;
   }
 
-  getString() {
-    return this.string;
-  }
-
   getStatement() {
     return this.statement;
   }
 
+  getString() { return this.statement.getString(); }
+
   verify(assignments, stated, localContext) {
     let verified;
 
-    const unqualifiedStatementString = trim(this.string); ///
+    const unqualifiedStatementString = this.getString(); ///
 
     localContext.trace(`Verifying the '${unqualifiedStatementString}' unqualified statement...`);
 
@@ -40,19 +36,37 @@ export default class UnqualifiedStatement {
     return verified;
   }
 
+  toJSON() {
+    const statementJSON = this.statement.toJSON(),
+          statement = statementJSON,  ///
+          json = {
+            statement
+          };
+
+    return json;
+  }
+
+  static fromJSON(json, fileContext) {
+    let { statement } = json;
+
+    json = statement; ///
+
+    statement = Statement.fromJSON(json, fileContext);
+
+    const unqualifiedStatement = new UnqualifiedStatement(statement);
+
+    return unqualifiedStatement;
+  }
+
   static fromUnqualifiedStatementNode(unqualifiedStatementNode, fileContext) {
     let unqualifiedStatement = null;
 
     if (unqualifiedStatementNode !== null) {
       const statementNode = statementNodeQuery(unqualifiedStatementNode),
             localContext = LocalContext.fromFileContext(fileContext),
-            statement = (statementNode !== null) ?
-                          Statement.fromStatementNode(statementNode, localContext) :
-                            null,
-            node = unqualifiedStatementNode,  ///
-            string = fileContext.nodeAsString(node);
+            statement = Statement.fromStatementNode(statementNode, localContext);
 
-      unqualifiedStatement = new UnqualifiedStatement(string, statement);
+      unqualifiedStatement = new UnqualifiedStatement(statement);
     }
 
     return unqualifiedStatement;

package/src/verifier/topLevel.js

@@ -1,6 +1,9 @@
 "use strict";
 
 import Rule from "../rule";
+import CombinatorDeclaration from "../declaration/combinator";
+import MetavariableDeclaration from "../declaration/metavariable";
+
 import Verifier from "../verifier";
 import verifyError from "../verify/error";
 import verifyAxiom from "../verify/axiom";
@@ -9,11 +12,9 @@ import verifyTheorem from "../verify/theorem";
 import verifyMetaLemma from "../verify/metaLemma";
 import verifyConjecture from "../verify/conjecture";
 import verifyMetatheorem from "../verify/metatheorem";
-import CombinatorDeclaration from "../declaration/combinator";
 import verifyTypeDeclaration from "../verify/declaration/type";
 import verifyVariableDeclaration from "../verify/declaration/variable";
 import verifyConstructorDeclaration from "../verify/declaration/constructor";
-import verifyMetavariableDeclaration from "../verify/declaration/metavariable";
 
 import { nodeQuery } from "../utilities/query";
 
@@ -145,7 +146,8 @@ class TopLevelVerifier extends Verifier {
     {
       nodeQuery: metavariableDeclarationNodeQuery,
       verify: (metavariableDeclarationNode, fileContext) => {
-        const metavariableDeclarationVerified = verifyMetavariableDeclaration(metavariableDeclarationNode, fileContext);
+        const metavariableDeclaration = MetavariableDeclaration.fromMetavariableDeclarationNode(metavariableDeclarationNode, fileContext),
+              metavariableDeclarationVerified = metavariableDeclaration.verify(fileContext);
 
         return metavariableDeclarationVerified;
       }