occam-verify-cli 0.0.871 → 0.0.873

package/lib/verify/metavariable.js

@@ -18,24 +18,36 @@ _export(exports, {
 });
 var _metavariable = /*#__PURE__*/ _interop_require_default(require("../metavariable"));
 var _metavariable1 = /*#__PURE__*/ _interop_require_default(require("../assignment/metavariable"));
+var _array = require("../utilities/array");
 var _query = require("../utilities/query");
+var _name = require("../utilities/name");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
-var typeNodeQuery = (0, _query.nodeQuery)("/argument/type"), argumentNodeQuery = (0, _query.nodeQuery)("/metavariable/argument!");
+var termNodeQuery = (0, _query.nodeQuery)("/argument/term"), typeNodeQuery = (0, _query.nodeQuery)("/argument/type"), argumentNodeQuery = (0, _query.nodeQuery)("/metavariable/argument!");
 function verifyMetavariable(metavariableNode, metaTypeNode, fileContext) {
     var metavariableVerified = false;
     var metavariableString = fileContext.nodeAsString(metavariableNode);
     fileContext.trace("Verifying the '".concat(metavariableString, "' metavariable..."), metavariableNode);
-    var metavariablePresent = fileContext.isMetavariablePresentByMetavariableNode(metavariableNode);
+    var name = (0, _name.nameFromMetavariableNode)(metavariableNode), metavariablePresent = fileContext.isMetavariablePresentByName(name);
     if (metavariablePresent) {
         fileContext.debug("The metavariable '".concat(metavariableString, "' is already present."), metavariableNode);
     } else {
-        var argumentNode = argumentNodeQuery(metavariableNode), argumentVerified = verifyArgument(metavariableNode, argumentNode, fileContext);
-        if (argumentVerified) {
-            var metaType = fileContext.findMetaTypeByMetaTypeNode(metaTypeNode), metavariable = _metavariable.default.fromMetavariableNodeAndMetaType(metavariableNode, metaType), metavariableAssignment = _metavariable1.default.fromMetavariable(metavariable), metavariableAssigned = metavariableAssignment.assign(fileContext);
+        var termTypes = [], metaTypes = [], argumentNode = argumentNodeQuery(metavariableNode), argumentVerified = verifyArgument(argumentNode, termTypes, fileContext), metaTypeVerified = verifyMetaType(metaTypeNode, metaTypes, fileContext);
+        if (argumentVerified && metaTypeVerified) {
+            var termType, metaType;
+            var firstMetaType = (0, _array.first)(metaTypes);
+            metaType = firstMetaType; ///
+            var termTypesLength = termTypes.length;
+            if (termTypesLength === 0) {
+                termType = null;
+            } else {
+                var firstTermType = (0, _array.first)(termTypes);
+                termType = firstTermType; ///
+            }
+            var node = metavariableNode, metavariable = _metavariable.default.fromNodeNameTermTypeAndMetaType(node, name, termType, metaType), metavariableAssignment = _metavariable1.default.fromMetavariable(metavariable), metavariableAssigned = metavariableAssignment.assign(fileContext);
             if (metavariableAssigned) {
                 metavariableVerified = true;
             }
@@ -60,23 +72,37 @@ function verifyStandaloneMetavariable(metavariableNode, localMetaContext, verify
     }
     return standaloneMetavariableVerified;
 }
-function verifyArgument(metavariableNode, argumentNode, fileContext) {
+function verifyArgument(argumentNode, termTypes, fileContext) {
     var argumentVerified = false;
     if (argumentNode === null) {
         argumentVerified = true;
     } else {
+        var termNode = termNodeQuery(argumentNode);
+        if (termNode === null) {} else {
+            var termString = fileContext.nodeAsString(termNode);
+            fileContext.debug("The '".concat(termString, "' term was found when a type should have been present."), termNode);
+        }
         var typeNode = typeNodeQuery(argumentNode);
         if (typeNode !== null) {
             var type = fileContext.findTypeByTypeNode(typeNode);
             if (type !== null) {
+                var termType = type; ///
+                termTypes.push(termType);
                 argumentVerified = true;
             } else {
-                var typeString = fileContext.nodeAsString(typeNode), metavariableString = fileContext.nodeAsString(metavariableNode);
-                fileContext.debug("The '".concat(metavariableString, "' metavariable's '").concat(typeString, "' type is not present."), metavariableNode);
+                var typeString = fileContext.nodeAsString(typeNode);
+                fileContext.debug("The '".concat(typeString, "' type is not present."), typeNode);
             }
         }
     }
     return argumentVerified;
 }
+function verifyMetaType(metaTypeNode, metaTypes, fileContext) {
+    var metaTypeVerified;
+    var metaType = fileContext.findMetaTypeByMetaTypeNode(metaTypeNode);
+    metaTypes.push(metaType);
+    metaTypeVerified = true;
+    return metaTypeVerified;
+}
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvbWV0YXZhcmlhYmxlLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgTWV0YXZhcmlhYmxlIGZyb20gXCIuLi9tZXRhdmFyaWFibGVcIjtcbmltcG9ydCBNZXRhdmFyaWFibGVBc3NpZ25tZW50IGZyb20gXCIuLi9hc3NpZ25tZW50L21ldGF2YXJpYWJsZVwiO1xuXG5pbXBvcnQgeyBub2RlUXVlcnkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5cbmNvbnN0IHR5cGVOb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvYXJndW1lbnQvdHlwZVwiKSxcbiAgICAgIGFyZ3VtZW50Tm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL21ldGF2YXJpYWJsZS9hcmd1bWVudCFcIik7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeU1ldGF2YXJpYWJsZShtZXRhdmFyaWFibGVOb2RlLCBtZXRhVHlwZU5vZGUsIGZpbGVDb250ZXh0KSB7XG4gIGxldCBtZXRhdmFyaWFibGVWZXJpZmllZCA9IGZhbHNlO1xuXG4gIGNvbnN0IG1ldGF2YXJpYWJsZVN0cmluZyA9IGZpbGVDb250ZXh0Lm5vZGVBc1N0cmluZyhtZXRhdmFyaWFibGVOb2RlKTtcblxuICBmaWxlQ29udGV4dC50cmFjZShgVmVyaWZ5aW5nIHRoZSAnJHttZXRhdmFyaWFibGVTdHJpbmd9JyBtZXRhdmFyaWFibGUuLi5gLCBtZXRhdmFyaWFibGVOb2RlKTtcblxuICBjb25zdCBtZXRhdmFyaWFibGVQcmVzZW50ID0gZmlsZUNvbnRleHQuaXNNZXRhdmFyaWFibGVQcmVzZW50QnlNZXRhdmFyaWFibGVOb2RlKG1ldGF2YXJpYWJsZU5vZGUpO1xuXG4gIGlmIChtZXRhdmFyaWFibGVQcmVzZW50KSB7XG4gICAgZmlsZUNvbnRleHQuZGVidWcoYFRoZSBtZXRhdmFyaWFibGUgJyR7bWV0YXZhcmlhYmxlU3RyaW5nfScgaXMgYWxyZWFkeSBwcmVzZW50LmAsIG1ldGF2YXJpYWJsZU5vZGUpO1xuICB9IGVsc2Uge1xuICAgIGNvbnN0IGFyZ3VtZW50Tm9kZSA9IGFyZ3VtZW50Tm9kZVF1ZXJ5KG1ldGF2YXJpYWJsZU5vZGUpLFxuICAgICAgICAgIGFyZ3VtZW50VmVyaWZpZWQgPSB2ZXJpZnlBcmd1bWVudChtZXRhdmFyaWFibGVOb2RlLCBhcmd1bWVudE5vZGUsIGZpbGVDb250ZXh0KTtcblxuICAgIGlmIChhcmd1bWVudFZlcmlmaWVkKSB7XG4gICAgICBjb25zdCBtZXRhVHlwZSA9IGZpbGVDb250ZXh0LmZpbmRNZXRhVHlwZUJ5TWV0YVR5cGVOb2RlKG1ldGFUeXBlTm9kZSksXG4gICAgICAgICAgICBtZXRhdmFyaWFibGUgPSBNZXRhdmFyaWFibGUuZnJvbU1ldGF2YXJpYWJsZU5vZGVBbmRNZXRhVHlwZShtZXRhdmFyaWFibGVOb2RlLCBtZXRhVHlwZSksXG4gICAgICAgICAgICBtZXRhdmFyaWFibGVBc3NpZ25tZW50ID0gTWV0YXZhcmlhYmxlQXNzaWdubWVudC5mcm9tTWV0YXZhcmlhYmxlKG1ldGF2YXJpYWJsZSksXG4gICAgICAgICAgICBtZXRhdmFyaWFibGVBc3NpZ25lZCA9IG1ldGF2YXJpYWJsZUFzc2lnbm1lbnQuYXNzaWduKGZpbGVDb250ZXh0KTtcblxuICAgICAgaWYgKG1ldGF2YXJpYWJsZUFzc2lnbmVkKSB7XG4gICAgICAgIG1ldGF2YXJpYWJsZVZlcmlmaWVkID0gdHJ1ZTtcbiAgICAgIH1cbiAgICB9XG4gIH1cblxuICBpZiAobWV0YXZhcmlhYmxlVmVyaWZpZWQpIHtcbiAgICBmaWxlQ29udGV4dC5kZWJ1ZyhgLi4udmVyaWZpZWQgdGhlICcke21ldGF2YXJpYWJsZVN0cmluZ30nIG1ldGF2YXJpYWJsZS5gLCBtZXRhdmFyaWFibGVOb2RlKTtcbiAgfVxuXG4gIHJldHVybiBtZXRhdmFyaWFibGVWZXJpZmllZDtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHZlcmlmeVN0YW5kYWxvbmVNZXRhdmFyaWFibGUobWV0YXZhcmlhYmxlTm9kZSwgbG9jYWxNZXRhQ29udGV4dCwgdmVyaWZ5QWhlYWQpIHtcbiAgbGV0IHN0YW5kYWxvbmVNZXRhdmFyaWFibGVWZXJpZmllZCA9IGZhbHNlO1xuXG4gIGNvbnN0IG1ldGF2YXJpYWJsZVN0cmluZyA9IGxvY2FsTWV0YUNvbnRleHQubm9kZUFzU3RyaW5nKG1ldGF2YXJpYWJsZU5vZGUpO1xuXG4gIGxvY2FsTWV0YUNvbnRleHQudHJhY2UoYFZlcmlmeWluZyB0aGUgJyR7bWV0YXZhcmlhYmxlU3RyaW5nfScgc3RhbmRhbG9uZSBtZXRhdmFyaWFibGUuLi5gLCBtZXRhdmFyaWFibGVOb2RlKTtcblxuICBjb25zdCBtZXRhdmFyaWFibGVQcmVzZW50ID0gbG9jYWxNZXRhQ29udGV4dC5pc01ldGF2YXJpYWJsZVByZXNlbnRCeU1ldGF2YXJpYWJsZU5vZGUobWV0YXZhcmlhYmxlTm9kZSk7XG5cbiAgaWYgKG1ldGF2YXJpYWJsZVByZXNlbnQpIHtcbiAgICBjb25zdCB2ZXJpZmllZEFoZWFkID0gdmVyaWZ5QWhlYWQoKTtcblxuICAgIHN0YW5kYWxvbmVNZXRhdmFyaWFibGVWZXJpZmllZCA9IHZlcmlmaWVkQWhlYWQ7IC8vL1xuICB9XG5cbiAgaWYgKHN0YW5kYWxvbmVNZXRhdmFyaWFibGVWZXJpZmllZCkge1xuICAgIGxvY2FsTWV0YUNvbnRleHQuZGVidWcoYC4uLnZlcmlmaWVkIHRoZSAnJHttZXRhdmFyaWFibGVTdHJpbmd9JyBzdGFuZGFsb25lIG1ldGF2YXJpYWJsZS5gLCBtZXRhdmFyaWFibGVOb2RlKTtcbiAgfVxuXG4gIHJldHVybiBzdGFuZGFsb25lTWV0YXZhcmlhYmxlVmVyaWZpZWQ7XG59XG5cbmZ1bmN0aW9uIHZlcmlmeUFyZ3VtZW50KG1ldGF2YXJpYWJsZU5vZGUsIGFyZ3VtZW50Tm9kZSwgZmlsZUNvbnRleHQpIHtcbiAgbGV0IGFyZ3VtZW50VmVyaWZpZWQgPSBmYWxzZTtcblxuICBpZiAoYXJndW1lbnROb2RlID09PSBudWxsKSB7XG4gICAgYXJndW1lbnRWZXJpZmllZCA9IHRydWU7XG4gIH0gZWxzZSB7XG4gICAgY29uc3QgdHlwZU5vZGUgPSB0eXBlTm9kZVF1ZXJ5KGFyZ3VtZW50Tm9kZSk7XG5cbiAgICBpZiAodHlwZU5vZGUgIT09IG51bGwpIHtcbiAgICAgIGNvbnN0IHR5cGUgPSBmaWxlQ29udGV4dC5maW5kVHlwZUJ5VHlwZU5vZGUodHlwZU5vZGUpO1xuXG4gICAgICBpZiAodHlwZSAhPT0gbnVsbCkge1xuICAgICAgICBhcmd1bWVudFZlcmlmaWVkID0gdHJ1ZTtcbiAgICAgIH0gZWxzZSB7XG4gICAgICAgIGNvbnN0IHR5cGVTdHJpbmcgPSBmaWxlQ29udGV4dC5ub2RlQXNTdHJpbmcodHlwZU5vZGUpLFxuICAgICAgICAgICAgICBtZXRhdmFyaWFibGVTdHJpbmcgPSBmaWxlQ29udGV4dC5ub2RlQXNTdHJpbmcobWV0YXZhcmlhYmxlTm9kZSk7XG5cbiAgICAgICAgZmlsZUNvbnRleHQuZGVidWcoYFRoZSAnJHttZXRhdmFyaWFibGVTdHJpbmd9JyBtZXRhdmFyaWFibGUncyAnJHt0eXBlU3RyaW5nfScgdHlwZSBpcyBub3QgcHJlc2VudC5gLCBtZXRhdmFyaWFibGVOb2RlKTtcbiAgICAgIH1cbiAgICB9XG4gIH1cblxuICByZXR1cm4gYXJndW1lbnRWZXJpZmllZDtcbn0iXSwibmFtZXMiOlsidmVyaWZ5TWV0YXZhcmlhYmxlIiwidmVyaWZ5U3RhbmRhbG9uZU1ldGF2YXJpYWJsZSIsInR5cGVOb2RlUXVlcnkiLCJub2RlUXVlcnkiLCJhcmd1bWVudE5vZGVRdWVyeSIsIm1ldGF2YXJpYWJsZU5vZGUiLCJtZXRhVHlwZU5vZGUiLCJmaWxlQ29udGV4dCIsIm1ldGF2YXJpYWJsZVZlcmlmaWVkIiwibWV0YXZhcmlhYmxlU3RyaW5nIiwibm9kZUFzU3RyaW5nIiwidHJhY2UiLCJtZXRhdmFyaWFibGVQcmVzZW50IiwiaXNNZXRhdmFyaWFibGVQcmVzZW50QnlNZXRhdmFyaWFibGVOb2RlIiwiZGVidWciLCJhcmd1bWVudE5vZGUiLCJhcmd1bWVudFZlcmlmaWVkIiwidmVyaWZ5QXJndW1lbnQiLCJtZXRhVHlwZSIsImZpbmRNZXRhVHlwZUJ5TWV0YVR5cGVOb2RlIiwibWV0YXZhcmlhYmxlIiwiTWV0YXZhcmlhYmxlIiwiZnJvbU1ldGF2YXJpYWJsZU5vZGVBbmRNZXRhVHlwZSIsIm1ldGF2YXJpYWJsZUFzc2lnbm1lbnQiLCJNZXRhdmFyaWFibGVBc3NpZ25tZW50IiwiZnJvbU1ldGF2YXJpYWJsZSIsIm1ldGF2YXJpYWJsZUFzc2lnbmVkIiwiYXNzaWduIiwibG9jYWxNZXRhQ29udGV4dCIsInZlcmlmeUFoZWFkIiwic3RhbmRhbG9uZU1ldGF2YXJpYWJsZVZlcmlmaWVkIiwidmVyaWZpZWRBaGVhZCIsInR5cGVOb2RlIiwidHlwZSIsImZpbmRUeXBlQnlUeXBlTm9kZSIsInR5cGVTdHJpbmciXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztJQVVBLE9BZ0NDO2VBaEN1QkE7O0lBa0NSQyw0QkFBNEI7ZUFBNUJBOzs7bUVBMUNTO29FQUNVO3FCQUVUOzs7Ozs7QUFFMUIsSUFBTUMsZ0JBQWdCQyxJQUFBQSxnQkFBUyxFQUFDLG1CQUMxQkMsb0JBQW9CRCxJQUFBQSxnQkFBUyxFQUFDO0FBRXJCLFNBQVNILG1CQUFtQkssZ0JBQWdCLEVBQUVDLFlBQVksRUFBRUMsV0FBVztJQUNwRixJQUFJQyx1QkFBdUI7SUFFM0IsSUFBTUMscUJBQXFCRixZQUFZRyxZQUFZLENBQUNMO0lBRXBERSxZQUFZSSxLQUFLLENBQUMsQUFBQyxrQkFBb0MsT0FBbkJGLG9CQUFtQixzQkFBb0JKO0lBRTNFLElBQU1PLHNCQUFzQkwsWUFBWU0sdUNBQXVDLENBQUNSO0lBRWhGLElBQUlPLHFCQUFxQjtRQUN2QkwsWUFBWU8sS0FBSyxDQUFDLEFBQUMscUJBQXVDLE9BQW5CTCxvQkFBbUIsMEJBQXdCSjtJQUNwRixPQUFPO1FBQ0wsSUFBTVUsZUFBZVgsa0JBQWtCQyxtQkFDakNXLG1CQUFtQkMsZUFBZVosa0JBQWtCVSxjQUFjUjtRQUV4RSxJQUFJUyxrQkFBa0I7WUFDcEIsSUFBTUUsV0FBV1gsWUFBWVksMEJBQTBCLENBQUNiLGVBQ2xEYyxlQUFlQyxxQkFBWSxDQUFDQywrQkFBK0IsQ0FBQ2pCLGtCQUFrQmEsV0FDOUVLLHlCQUF5QkMsc0JBQXNCLENBQUNDLGdCQUFnQixDQUFDTCxlQUNqRU0sdUJBQXVCSCx1QkFBdUJJLE1BQU0sQ0FBQ3BCO1lBRTNELElBQUltQixzQkFBc0I7Z0JBQ3hCbEIsdUJBQXVCO1lBQ3pCO1FBQ0Y7SUFDRjtJQUVBLElBQUlBLHNCQUFzQjtRQUN4QkQsWUFBWU8sS0FBSyxDQUFDLEFBQUMsb0JBQXNDLE9BQW5CTCxvQkFBbUIsb0JBQWtCSjtJQUM3RTtJQUVBLE9BQU9HO0FBQ1Q7QUFFTyxTQUFTUCw2QkFBNkJJLGdCQUFnQixFQUFFdUIsZ0JBQWdCLEVBQUVDLFdBQVc7SUFDMUYsSUFBSUMsaUNBQWlDO0lBRXJDLElBQU1yQixxQkFBcUJtQixpQkFBaUJsQixZQUFZLENBQUNMO0lBRXpEdUIsaUJBQWlCakIsS0FBSyxDQUFDLEFBQUMsa0JBQW9DLE9BQW5CRixvQkFBbUIsaUNBQStCSjtJQUUzRixJQUFNTyxzQkFBc0JnQixpQkFBaUJmLHVDQUF1QyxDQUFDUjtJQUVyRixJQUFJTyxxQkFBcUI7UUFDdkIsSUFBTW1CLGdCQUFnQkY7UUFFdEJDLGlDQUFpQ0MsZUFBZSxHQUFHO0lBQ3JEO0lBRUEsSUFBSUQsZ0NBQWdDO1FBQ2xDRixpQkFBaUJkLEtBQUssQ0FBQyxBQUFDLG9CQUFzQyxPQUFuQkwsb0JBQW1CLCtCQUE2Qko7SUFDN0Y7SUFFQSxPQUFPeUI7QUFDVDtBQUVBLFNBQVNiLGVBQWVaLGdCQUFnQixFQUFFVSxZQUFZLEVBQUVSLFdBQVc7SUFDakUsSUFBSVMsbUJBQW1CO0lBRXZCLElBQUlELGlCQUFpQixNQUFNO1FBQ3pCQyxtQkFBbUI7SUFDckIsT0FBTztRQUNMLElBQU1nQixXQUFXOUIsY0FBY2E7UUFFL0IsSUFBSWlCLGFBQWEsTUFBTTtZQUNyQixJQUFNQyxPQUFPMUIsWUFBWTJCLGtCQUFrQixDQUFDRjtZQUU1QyxJQUFJQyxTQUFTLE1BQU07Z0JBQ2pCakIsbUJBQW1CO1lBQ3JCLE9BQU87Z0JBQ0wsSUFBTW1CLGFBQWE1QixZQUFZRyxZQUFZLENBQUNzQixXQUN0Q3ZCLHFCQUFxQkYsWUFBWUcsWUFBWSxDQUFDTDtnQkFFcERFLFlBQVlPLEtBQUssQ0FBQyxBQUFDLFFBQThDcUIsT0FBdkMxQixvQkFBbUIsc0JBQStCLE9BQVgwQixZQUFXLDJCQUF5QjlCO1lBQ3ZHO1FBQ0Y7SUFDRjtJQUVBLE9BQU9XO0FBQ1QifQ==
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/metavariable.js"],"sourcesContent":["\"use strict\";\n\nimport Metavariable from \"../metavariable\";\nimport MetavariableAssignment from \"../assignment/metavariable\";\n\nimport { first } from \"../utilities/array\";\nimport { nodeQuery } from \"../utilities/query\";\nimport { nameFromMetavariableNode } from \"../utilities/name\";\n\nconst termNodeQuery = nodeQuery(\"/argument/term\"),\n      typeNodeQuery = nodeQuery(\"/argument/type\"),\n      argumentNodeQuery = nodeQuery(\"/metavariable/argument!\");\n\nexport default function verifyMetavariable(metavariableNode, metaTypeNode, fileContext) {\n  let metavariableVerified = false;\n\n  const metavariableString = fileContext.nodeAsString(metavariableNode);\n\n  fileContext.trace(`Verifying the '${metavariableString}' metavariable...`, metavariableNode);\n\n  const name = nameFromMetavariableNode(metavariableNode),\n        metavariablePresent = fileContext.isMetavariablePresentByName(name);\n\n  if (metavariablePresent) {\n    fileContext.debug(`The metavariable '${metavariableString}' is already present.`, metavariableNode);\n  } else {\n    const termTypes = [],\n          metaTypes = [],\n          argumentNode = argumentNodeQuery(metavariableNode),\n          argumentVerified = verifyArgument(argumentNode, termTypes, fileContext),\n          metaTypeVerified = verifyMetaType(metaTypeNode, metaTypes, fileContext);\n\n    if (argumentVerified && metaTypeVerified) {\n      let termType,\n          metaType;\n\n      const firstMetaType = first(metaTypes);\n\n      metaType = firstMetaType; ///\n\n      const termTypesLength = termTypes.length;\n\n      if (termTypesLength === 0) {\n        termType = null;\n      } else {\n        const firstTermType = first(termTypes);\n\n        termType = firstTermType; ///\n      }\n\n      const node = metavariableNode,  ///\n            metavariable = Metavariable.fromNodeNameTermTypeAndMetaType(node, name, termType, metaType),\n            metavariableAssignment = MetavariableAssignment.fromMetavariable(metavariable),\n            metavariableAssigned = metavariableAssignment.assign(fileContext);\n\n      if (metavariableAssigned) {\n        metavariableVerified = true;\n      }\n    }\n  }\n\n  if (metavariableVerified) {\n    fileContext.debug(`...verified the '${metavariableString}' metavariable.`, metavariableNode);\n  }\n\n  return metavariableVerified;\n}\n\nexport function verifyStandaloneMetavariable(metavariableNode, localMetaContext, verifyAhead) {\n  let standaloneMetavariableVerified = false;\n\n  const metavariableString = localMetaContext.nodeAsString(metavariableNode);\n\n  localMetaContext.trace(`Verifying the '${metavariableString}' standalone metavariable...`, metavariableNode);\n\n  const metavariablePresent = localMetaContext.isMetavariablePresentByMetavariableNode(metavariableNode);\n\n  if (metavariablePresent) {\n    const verifiedAhead = verifyAhead();\n\n    standaloneMetavariableVerified = verifiedAhead; ///\n  }\n\n  if (standaloneMetavariableVerified) {\n    localMetaContext.debug(`...verified the '${metavariableString}' standalone metavariable.`, metavariableNode);\n  }\n\n  return standaloneMetavariableVerified;\n}\n\nfunction verifyArgument(argumentNode, termTypes, fileContext) {\n  let argumentVerified = false;\n\n  if (argumentNode === null) {\n    argumentVerified = true;\n  } else {\n    const termNode = termNodeQuery(argumentNode);\n\n    if (termNode === null) {\n\n    } else {\n      const termString = fileContext.nodeAsString(termNode);\n\n      fileContext.debug(`The '${termString}' term was found when a type should have been present.`, termNode);\n    }\n    const typeNode = typeNodeQuery(argumentNode);\n\n    if (typeNode !== null) {\n      const type = fileContext.findTypeByTypeNode(typeNode);\n\n      if (type !== null) {\n        const termType = type;  ///\n\n        termTypes.push(termType);\n\n        argumentVerified = true;\n      } else {\n        const typeString = fileContext.nodeAsString(typeNode);\n\n        fileContext.debug(`The '${typeString}' type is not present.`, typeNode);\n      }\n    }\n  }\n\n  return argumentVerified;\n}\n\nfunction verifyMetaType(metaTypeNode, metaTypes, fileContext) {\n  let metaTypeVerified;\n\n  const metaType = fileContext.findMetaTypeByMetaTypeNode(metaTypeNode);\n\n  metaTypes.push(metaType);\n\n  metaTypeVerified = true;\n\n  return metaTypeVerified;\n}"],"names":["verifyMetavariable","verifyStandaloneMetavariable","termNodeQuery","nodeQuery","typeNodeQuery","argumentNodeQuery","metavariableNode","metaTypeNode","fileContext","metavariableVerified","metavariableString","nodeAsString","trace","name","nameFromMetavariableNode","metavariablePresent","isMetavariablePresentByName","debug","termTypes","metaTypes","argumentNode","argumentVerified","verifyArgument","metaTypeVerified","verifyMetaType","termType","metaType","firstMetaType","first","termTypesLength","length","firstTermType","node","metavariable","Metavariable","fromNodeNameTermTypeAndMetaType","metavariableAssignment","MetavariableAssignment","fromMetavariable","metavariableAssigned","assign","localMetaContext","verifyAhead","standaloneMetavariableVerified","isMetavariablePresentByMetavariableNode","verifiedAhead","termNode","termString","typeNode","type","findTypeByTypeNode","push","typeString","findMetaTypeByMetaTypeNode"],"mappings":"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"}

package/package.json

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

package/src/context/file.js

@@ -314,6 +314,19 @@ export default class FileContext {
     return type;
   }
 
+  findMetavariableByName(name) {
+    const metavariables = this.getMetavariables(),
+          metavariable = metavariables.find((metavariable) => {
+        const matches = metavariable.matchName(name);
+
+        if (matches) {
+          return true;
+        }
+      }) || null;
+
+    return metavariable;
+  }
+
   findVariableByVariableNode(variableNode) {
     const node = variableNode,  ///
           variables = this.getVariables(),
@@ -474,6 +487,13 @@ export default class FileContext {
     return typePresent;
   }
 
+  isMetavariablePresentByName(name) {
+    const metavariable = this.findMetavariableByName(name),
+          metavariablePresent = (metavariable !== null);
+
+    return metavariablePresent;
+  }
+
   isVariablePresentByVariableNode(variableNode) {
     const variable = this.findVariableByVariableNode(variableNode),
           variablePresent = (variable !== null);
@@ -589,9 +609,9 @@ export default class FileContext {
   addMetavariable(metavariable) {
     let metavariableAdded = false;
 
-    const node = metavariable.getNode(),
+    const name = metavariable.getName(),
           metavariablePresent = this.metavariables.some((metavariable) => {
-            const nodeMatches = metavariable.matchNode(node);
+            const nodeMatches = metavariable.matchName(name);
 
             if (nodeMatches) {
               return true;

package/src/metaType/context.js

@@ -0,0 +1,18 @@
+"use strict";
+
+import MetaType from "../metaType";
+
+import { CONTEXT_META_TYPE_NAME } from "../metaTypeNames";
+
+class ContextMetaType extends MetaType {
+  static fromNothing() {
+    const name = CONTEXT_META_TYPE_NAME,
+          contextMetaType = new ContextMetaType(name);
+
+    return contextMetaType;
+  }
+}
+
+const contextMetaType = ContextMetaType.fromNothing();
+
+export default contextMetaType;

package/src/metaType/label.js

@@ -0,0 +1,18 @@
+"use strict";
+
+import MetaType from "../metaType";
+
+import { LABEL_META_TYPE_NAME } from "../metaTypeNames";
+
+class LabelMetaType extends MetaType {
+  static fromNothing() {
+    const name = LABEL_META_TYPE_NAME,
+          labelMetaType = new LabelMetaType(name);
+
+    return labelMetaType;
+  }
+}
+
+const labelMetaType = LabelMetaType.fromNothing();
+
+export default labelMetaType;

package/src/metaType/statement.js

@@ -0,0 +1,18 @@
+"use strict";
+
+import MetaType from "../metaType";
+
+import { STATEMENT_META_TYPE_NAME } from "../metaTypeNames";
+
+class StatementMetaType extends MetaType {
+  static fromNothing() {
+    const name = STATEMENT_META_TYPE_NAME,
+          statementMetaType = new StatementMetaType(name);
+
+    return statementMetaType;
+  }
+}
+
+const statementMetaType = StatementMetaType.fromNothing();
+
+export default statementMetaType;

package/src/metaType.js

@@ -1,7 +1,6 @@
 "use strict";
 
 import { metaTypeNameFromMetaTypeNode } from "./utilities/name";
-import { CONTEXT_META_TYPE_NAME, STATEMENT_META_TYPE_NAME } from "./metaTypeNames";
 
 export default class MetaType {
   constructor(name) {
@@ -68,28 +67,6 @@ export default class MetaType {
   }
 }
 
-class ContextMetaType extends MetaType {
-  static fromNothing() {
-    const name = CONTEXT_META_TYPE_NAME,
-          contextMetaType = new ContextMetaType(name);
-
-    return contextMetaType;
-  }
-}
-
-class StatementMetaType extends MetaType {
-  static fromNothing() {
-    const name = STATEMENT_META_TYPE_NAME,
-          statementMetaType = new StatementMetaType(name);
-
-    return statementMetaType;
-  }
-}
-
-export const contextMetaType = ContextMetaType.fromNothing();
-
-export const statementMetaType = StatementMetaType.fromNothing();
-
 export function metaTypeFromJSONAndFileContext(json, fileContext) {
   let metaType;
 

package/src/metaTypeNames.js

@@ -1,4 +1,5 @@
 "use strict";
 
-export const CONTEXT_META_TYPE_NAME = "Context";
 export const STATEMENT_META_TYPE_NAME = "Statement";
+export const CONTEXT_META_TYPE_NAME = "Context";
+export const LABEL_META_TYPE_NAME = "Label";

package/src/metaTypes.js

@@ -1,8 +1,11 @@
 "use strict";
 
-import { contextMetaType, statementMetaType } from "./metaType";
+import labelMetaType from "./metaType/label";
+import contextMetaType from "./metaType/context";
+import statementMetaType from "./metaType/statement";
 
 const metaTypes = [
+  labelMetaType,
   contextMetaType,
   statementMetaType
 ];

package/src/metavariable.js

@@ -1,11 +1,18 @@
 "use strict";
 
+import { nodeQuery } from "./utilities/query";
 import { nodeAsString } from "./utilities/string";
+import { nameFromMetavariableNode } from "./utilities/name";
 import { metaTypeFromJSONAndFileContext } from "./metaType";
+import { metavariableNodeFromMetavariableString } from "./utilities/node";
+
+const typeNodeQuery = nodeQuery("/metavariable/argument!/type!");
 
 export default class Metavariable {
-  constructor(node, metaType) {
+  constructor(node, name, termType, metaType) {
     this.node = node;
+    this.name = name;
+    this.termType = termType;
     this.metaType = metaType;
   }
 
@@ -13,21 +20,42 @@ export default class Metavariable {
     return this.node;
   }
 
+  getName() {
+    return this.name;
+  }
+
+  getTermType() {
+    return this.termType;
+  }
+
   getMetaType() {
     return this.metaType;
   }
 
+  matchName(name) {
+    const nameMatches = (this.name === name);
+
+    return nameMatches;
+  }
+
   matchNode(node) {
-    const nodeMatches = this.node.match(node);
+    let nodeMatches;
+
+    const metavariableNode = node,  ///
+          name = nameFromMetavariableNode(metavariableNode);
+
+    if (this.name === name) {
+      nodeMatches = true;
+    }
 
     return nodeMatches;
   }
 
   toJSON(tokens) {
     const metaTypeJSON = this.metaType.toJSON(tokens),
-          metaType = metaTypeJSON,  ///
           string = nodeAsString(this.node, tokens),
-          node = string,  ///
+          node = string,  //
+          metaType = metaTypeJSON,  ///
           json = {
             node,
             metaType
@@ -41,13 +69,20 @@ export default class Metavariable {
 
     let string = nodeAsString(this.node, tokens);
 
-    string = `${string}:${metaTypeName}`;
+    string = `${string}:${metaTypeName}`; ///
 
     return string;
   }
 
   static fromJSONAndFileContext(json, fileContext) {
-    const { node } = json;
+    let { node } = json;
+
+    const lexer  = fileContext.getLexer(),
+          parser = fileContext.getParser(),
+          variableString = node,  ///
+          metavariableNode = metavariableNodeFromMetavariableString(variableString, lexer, parser);
+
+    node = metavariableNode;  ///
 
     let { metaType } = json;
 
@@ -55,15 +90,30 @@ export default class Metavariable {
 
     metaType = metaTypeFromJSONAndFileContext(json, fileContext);
 
-    const metavariable = new Metavariable(node, metaType);
+    const name = nameFromMetavariableNode(metavariableNode),
+          termType = termTypeFromMetavariableNode(metavariableNode, fileContext),
+          metavariable = new Metavariable(node, name, termType, metaType);
 
     return metavariable;
   }
 
-  static fromMetavariableNodeAndMetaType(metavariableNode, metaType) {
-    const node = metavariableNode,  ///
-          metavariable = new Metavariable(node, metaType);
+  static fromNodeNameTermTypeAndMetaType(node, name, termType, metaType) {
+    const metavariable = new Metavariable(node, name, termType, metaType);
 
     return metavariable;
   }
 }
+
+function termTypeFromMetavariableNode(metavariableNode, fileContext) {
+  let termType = null;
+
+  const typeNode = typeNodeQuery(metavariableNode);
+
+  if (typeNode !== null) {
+      const type = fileContext.findTypeByTypeNode(typeNode);
+
+      termType = type;  ///
+  }
+
+  return termType;
+}

package/src/mixins/context.js

@@ -28,10 +28,14 @@ function findTypeByTypeName(typeName) { return this.context.findTypeByTypeName(t
 
 function findTypeByTypeNode(labelMetavariableNode) { return this.context.findTypeByTypeNode(labelMetavariableNode); }
 
+function findMetavariableByName(name) { return this.context.findMetavariableByName(name); }
+
 function isTypePresentByTypeName(typeName) { return this.context.isTypePresentByTypeName(typeName); }
 
 function isTypePresentByTypeNode(typeNode) { return this.context.isTypePresentByTypeNode(typeNode); }
 
+function isMetavariablePresentByName(name) { return this.context.isMetavariablePresentByName(name); }
+
 function findLabelByLabelMetavariableNode(labelMetavariableNode) { return this.context.findLabelByLabelMetavariableNode(labelMetavariableNode); }
 
 function findRuleByLabelMetavariableNode(labelMetavariableNode) { return this.context.findRuleByLabelMetavariableNode(labelMetavariableNode); }
@@ -65,8 +69,10 @@ const contextMixins = {
   getConstructors,
   findTypeByTypeName,
   findTypeByTypeNode,
+  findMetavariableByName,
   isTypePresentByTypeName,
   isTypePresentByTypeNode,
+  isMetavariablePresentByName,
   findLabelByLabelMetavariableNode,
   findRuleByLabelMetavariableNode,
   findAxiomByLabelMetavariableNode,

package/src/releaseContext/create.js

@@ -79,7 +79,7 @@ function checkReleaseContextCreated(releaseContext, dependency, context) {
           dependencyName = dependency.getName(),
           releaseName = dependencyName; ///
 
-    log.error(`The '${releaseName}' context could not be created. Most likely the 'meta.json' file is missing or invalid.`);
+    log.error(`The '${releaseName}' context could not be created. Perhaps the 'meta.json' file is missing or invalid or most likely one of the dependencies is missing or mis-versioned.`);
   }
 
   return releaseContextCreated;

package/src/verify/metavariable.js

@@ -3,9 +3,12 @@
 import Metavariable from "../metavariable";
 import MetavariableAssignment from "../assignment/metavariable";
 
+import { first } from "../utilities/array";
 import { nodeQuery } from "../utilities/query";
+import { nameFromMetavariableNode } from "../utilities/name";
 
-const typeNodeQuery = nodeQuery("/argument/type"),
+const termNodeQuery = nodeQuery("/argument/term"),
+      typeNodeQuery = nodeQuery("/argument/type"),
       argumentNodeQuery = nodeQuery("/metavariable/argument!");
 
 export default function verifyMetavariable(metavariableNode, metaTypeNode, fileContext) {
@@ -15,17 +18,38 @@ export default function verifyMetavariable(metavariableNode, metaTypeNode, fileC
 
   fileContext.trace(`Verifying the '${metavariableString}' metavariable...`, metavariableNode);
 
-  const metavariablePresent = fileContext.isMetavariablePresentByMetavariableNode(metavariableNode);
+  const name = nameFromMetavariableNode(metavariableNode),
+        metavariablePresent = fileContext.isMetavariablePresentByName(name);
 
   if (metavariablePresent) {
     fileContext.debug(`The metavariable '${metavariableString}' is already present.`, metavariableNode);
   } else {
-    const argumentNode = argumentNodeQuery(metavariableNode),
-          argumentVerified = verifyArgument(metavariableNode, argumentNode, fileContext);
+    const termTypes = [],
+          metaTypes = [],
+          argumentNode = argumentNodeQuery(metavariableNode),
+          argumentVerified = verifyArgument(argumentNode, termTypes, fileContext),
+          metaTypeVerified = verifyMetaType(metaTypeNode, metaTypes, fileContext);
 
-    if (argumentVerified) {
-      const metaType = fileContext.findMetaTypeByMetaTypeNode(metaTypeNode),
-            metavariable = Metavariable.fromMetavariableNodeAndMetaType(metavariableNode, metaType),
+    if (argumentVerified && metaTypeVerified) {
+      let termType,
+          metaType;
+
+      const firstMetaType = first(metaTypes);
+
+      metaType = firstMetaType; ///
+
+      const termTypesLength = termTypes.length;
+
+      if (termTypesLength === 0) {
+        termType = null;
+      } else {
+        const firstTermType = first(termTypes);
+
+        termType = firstTermType; ///
+      }
+
+      const node = metavariableNode,  ///
+            metavariable = Metavariable.fromNodeNameTermTypeAndMetaType(node, name, termType, metaType),
             metavariableAssignment = MetavariableAssignment.fromMetavariable(metavariable),
             metavariableAssigned = metavariableAssignment.assign(fileContext);
 
@@ -64,27 +88,51 @@ export function verifyStandaloneMetavariable(metavariableNode, localMetaContext,
   return standaloneMetavariableVerified;
 }
 
-function verifyArgument(metavariableNode, argumentNode, fileContext) {
+function verifyArgument(argumentNode, termTypes, fileContext) {
   let argumentVerified = false;
 
   if (argumentNode === null) {
     argumentVerified = true;
   } else {
+    const termNode = termNodeQuery(argumentNode);
+
+    if (termNode === null) {
+
+    } else {
+      const termString = fileContext.nodeAsString(termNode);
+
+      fileContext.debug(`The '${termString}' term was found when a type should have been present.`, termNode);
+    }
     const typeNode = typeNodeQuery(argumentNode);
 
     if (typeNode !== null) {
       const type = fileContext.findTypeByTypeNode(typeNode);
 
       if (type !== null) {
+        const termType = type;  ///
+
+        termTypes.push(termType);
+
         argumentVerified = true;
       } else {
-        const typeString = fileContext.nodeAsString(typeNode),
-              metavariableString = fileContext.nodeAsString(metavariableNode);
+        const typeString = fileContext.nodeAsString(typeNode);
 
-        fileContext.debug(`The '${metavariableString}' metavariable's '${typeString}' type is not present.`, metavariableNode);
+        fileContext.debug(`The '${typeString}' type is not present.`, typeNode);
       }
     }
   }
 
   return argumentVerified;
+}
+
+function verifyMetaType(metaTypeNode, metaTypes, fileContext) {
+  let metaTypeVerified;
+
+  const metaType = fileContext.findMetaTypeByMetaTypeNode(metaTypeNode);
+
+  metaTypes.push(metaType);
+
+  metaTypeVerified = true;
+
+  return metaTypeVerified;
 }