occam-verify-cli 0.0.1026 → 0.0.1028

package/lib/declaration/variable.js

@@ -8,10 +8,9 @@ Object.defineProperty(exports, "default", {
         return VariableDeclaration;
     }
 });
-var _shim = /*#__PURE__*/ _interop_require_default(require("../shim"));
 var _variable = /*#__PURE__*/ _interop_require_default(require("../variable"));
 var _query = require("../utilities/query");
-var _type = require("../type");
+var _name = require("../utilities/name");
 function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
@@ -84,23 +83,23 @@ var VariableDeclaration = /*#__PURE__*/ function() {
         {
             key: "fromVariableDeclarationNode",
             value: function fromVariableDeclarationNode(variableDeclarationNode, fileContext) {
-                var Type = _shim.default.Type, typeNode = typeNodeQuery(variableDeclarationNode), type = typeNode === null ? _type.objectType : Type.fromTypeNode(typeNode, fileContext), variable = _variable.default.fromVariableDeclarationNode(variableDeclarationNode, fileContext), string = stringFromVariableAndType(variable, type), variableDeclaration = new VariableDeclaration(fileContext, string, variable);
+                var typeNode = typeNodeQuery(variableDeclarationNode), variable = _variable.default.fromVariableDeclarationNode(variableDeclarationNode, fileContext), string = stringFromVariableAndTypeNode(variable, typeNode), variableDeclaration = new VariableDeclaration(fileContext, string, variable);
                 return variableDeclaration;
             }
         }
     ]);
     return VariableDeclaration;
 }();
-function stringFromVariableAndType(variable, type) {
+function stringFromVariableAndTypeNode(variable, typeNode) {
     var string;
     var variableString = variable.getString();
-    if (type === null) {
+    if (typeNode === null) {
         string = variableString; ///
     } else {
-        var typeString = type.getString();
-        string = "".concat(variableString, ":").concat(typeString);
+        var typeName = (0, _name.typeNameFromTypeNode)(typeNode);
+        string = "".concat(variableString, ":").concat(typeName);
     }
     return string;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kZWNsYXJhdGlvbi92YXJpYWJsZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHNoaW0gZnJvbSBcIi4uL3NoaW1cIjtcbmltcG9ydCBWYXJpYWJsZSBmcm9tIFwiLi4vdmFyaWFibGVcIjtcblxuaW1wb3J0IHsgbm9kZVF1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuaW1wb3J0IHsgb2JqZWN0VHlwZSB9IGZyb20gXCIuLi90eXBlXCI7XG5cbmNvbnN0IHR5cGVOb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvdmFyaWFibGVEZWNsYXJhdGlvbi90eXBlXCIpO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBWYXJpYWJsZURlY2xhcmF0aW9uIHtcbiAgY29uc3RydWN0b3IoZmlsZUNvbnRleHQsIHN0cmluZywgdmFyaWFibGUpIHtcbiAgICB0aGlzLmZpbGVDb250ZXh0ID0gZmlsZUNvbnRleHQ7XG4gICAgdGhpcy5zdHJpbmcgPSBzdHJpbmc7XG4gICAgdGhpcy52YXJpYWJsZSA9IHZhcmlhYmxlO1xuICB9XG5cbiAgZ2V0RmlsZUNvbnRleHQoKSB7XG4gICAgcmV0dXJuIHRoaXMuZmlsZUNvbnRleHQ7XG4gIH1cblxuICBnZXRTdHJpbmcoKSB7XG4gICAgcmV0dXJuIHRoaXMuc3RyaW5nO1xuICB9XG5cbiAgZ2V0VmFyaWFibGUoKSB7XG4gICAgcmV0dXJuIHRoaXMudmFyaWFibGU7XG4gIH1cblxuICB2ZXJpZnkoKSB7XG4gICAgbGV0IHZlcmlmaWVkO1xuXG4gICAgY29uc3QgdmFyaWFibGVEZWNsYXJhdGlvblN0cmluZyA9IHRoaXMuc3RyaW5nOyAvLy9cblxuICAgIHRoaXMuZmlsZUNvbnRleHQudHJhY2UoYFZlcmlmeWluZyB0aGUgJyR7dmFyaWFibGVEZWNsYXJhdGlvblN0cmluZ30nIHZhcmlhYmxlIGRlY2xhcmF0aW9uLi4uYCk7XG5cbiAgICBjb25zdCB2YXJpYWJsZVZlcmlmaWVkQXRUb3BMZXZlbCA9IHRoaXMudmFyaWFibGUudmVyaWZ5QXRUb3BMZXZlbCh0aGlzLmZpbGVDb250ZXh0KTtcblxuICAgIGlmICh2YXJpYWJsZVZlcmlmaWVkQXRUb3BMZXZlbCkge1xuICAgICAgdGhpcy5maWxlQ29udGV4dC5hZGRWYXJpYWJsZSh0aGlzLnZhcmlhYmxlKTtcblxuICAgICAgdmVyaWZpZWQgPSB0cnVlO1xuICAgIH1cblxuICAgIGlmICh2ZXJpZmllZCkge1xuICAgICAgdGhpcy5maWxlQ29udGV4dC5kZWJ1ZyhgLi4udmVyaWZpZWQgdGhlICcke3ZhcmlhYmxlRGVjbGFyYXRpb25TdHJpbmd9JyB2YXJpYWJsZSBkZWNsYXJhdGlvbi5gKTtcbiAgICB9XG5cbiAgICByZXR1cm4gdmVyaWZpZWQ7XG4gIH1cblxuICBzdGF0aWMgZnJvbVZhcmlhYmxlRGVjbGFyYXRpb25Ob2RlKHZhcmlhYmxlRGVjbGFyYXRpb25Ob2RlLCBmaWxlQ29udGV4dCkge1xuICAgIGNvbnN0IHsgVHlwZSB9ID0gc2hpbSxcbiAgICAgICAgICB0eXBlTm9kZSA9IHR5cGVOb2RlUXVlcnkodmFyaWFibGVEZWNsYXJhdGlvbk5vZGUpLFxuICAgICAgICAgIHR5cGUgPSAodHlwZU5vZGUgPT09IG51bGwpID9cbiAgICAgICAgICAgICAgICAgICBvYmplY3RUeXBlIDpcbiAgICAgICAgICAgICAgICAgICAgIFR5cGUuZnJvbVR5cGVOb2RlKHR5cGVOb2RlLCBmaWxlQ29udGV4dCksXG4gICAgICAgICAgdmFyaWFibGUgPSBWYXJpYWJsZS5mcm9tVmFyaWFibGVEZWNsYXJhdGlvbk5vZGUodmFyaWFibGVEZWNsYXJhdGlvbk5vZGUsIGZpbGVDb250ZXh0KSxcbiAgICAgICAgICBzdHJpbmcgPSBzdHJpbmdGcm9tVmFyaWFibGVBbmRUeXBlKHZhcmlhYmxlLCB0eXBlKSxcbiAgICAgICAgICB2YXJpYWJsZURlY2xhcmF0aW9uID0gbmV3IFZhcmlhYmxlRGVjbGFyYXRpb24oZmlsZUNvbnRleHQsIHN0cmluZywgdmFyaWFibGUpO1xuXG4gICAgcmV0dXJuIHZhcmlhYmxlRGVjbGFyYXRpb247XG4gIH1cbn1cblxuZnVuY3Rpb24gc3RyaW5nRnJvbVZhcmlhYmxlQW5kVHlwZSh2YXJpYWJsZSwgdHlwZSkge1xuICBsZXQgc3RyaW5nO1xuXG4gIGNvbnN0IHZhcmlhYmxlU3RyaW5nID0gdmFyaWFibGUuZ2V0U3RyaW5nKCk7XG5cbiAgaWYgKHR5cGUgPT09IG51bGwpIHtcbiAgICBzdHJpbmcgPSB2YXJpYWJsZVN0cmluZzsgIC8vL1xuICB9IGVsc2Uge1xuICAgIGNvbnN0IHR5cGVTdHJpbmcgPSB0eXBlLmdldFN0cmluZygpO1xuXG4gICAgc3RyaW5nID0gYCR7dmFyaWFibGVTdHJpbmd9OiR7dHlwZVN0cmluZ31gO1xuICB9XG5cbiAgcmV0dXJuIHN0cmluZztcbn1cbiJdLCJuYW1lcyI6WyJWYXJpYWJsZURlY2xhcmF0aW9uIiwidHlwZU5vZGVRdWVyeSIsIm5vZGVRdWVyeSIsImZpbGVDb250ZXh0Iiwic3RyaW5nIiwidmFyaWFibGUiLCJnZXRGaWxlQ29udGV4dCIsImdldFN0cmluZyIsImdldFZhcmlhYmxlIiwidmVyaWZ5IiwidmVyaWZpZWQiLCJ2YXJpYWJsZURlY2xhcmF0aW9uU3RyaW5nIiwidHJhY2UiLCJ2YXJpYWJsZVZlcmlmaWVkQXRUb3BMZXZlbCIsInZlcmlmeUF0VG9wTGV2ZWwiLCJhZGRWYXJpYWJsZSIsImRlYnVnIiwiZnJvbVZhcmlhYmxlRGVjbGFyYXRpb25Ob2RlIiwidmFyaWFibGVEZWNsYXJhdGlvbk5vZGUiLCJUeXBlIiwic2hpbSIsInR5cGVOb2RlIiwidHlwZSIsIm9iamVjdFR5cGUiLCJmcm9tVHlwZU5vZGUiLCJWYXJpYWJsZSIsInN0cmluZ0Zyb21WYXJpYWJsZUFuZFR5cGUiLCJ2YXJpYWJsZURlY2xhcmF0aW9uIiwidmFyaWFibGVTdHJpbmciLCJ0eXBlU3RyaW5nIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztlQVVxQkE7OzsyREFSSjsrREFDSTtxQkFFSztvQkFDQzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUUzQixJQUFNQyxnQkFBZ0JDLElBQUFBLGdCQUFTLEVBQUM7QUFFakIsSUFBQSxBQUFNRixvQ0FBTjthQUFNQSxvQkFDUEcsV0FBVyxFQUFFQyxNQUFNLEVBQUVDLFFBQVE7Z0NBRHRCTDtRQUVqQixJQUFJLENBQUNHLFdBQVcsR0FBR0E7UUFDbkIsSUFBSSxDQUFDQyxNQUFNLEdBQUdBO1FBQ2QsSUFBSSxDQUFDQyxRQUFRLEdBQUdBOztrQkFKQ0w7O1lBT25CTSxLQUFBQTttQkFBQUEsU0FBQUE7Z0JBQ0UsT0FBTyxJQUFJLENBQUNILFdBQVc7WUFDekI7OztZQUVBSSxLQUFBQTttQkFBQUEsU0FBQUE7Z0JBQ0UsT0FBTyxJQUFJLENBQUNILE1BQU07WUFDcEI7OztZQUVBSSxLQUFBQTttQkFBQUEsU0FBQUE7Z0JBQ0UsT0FBTyxJQUFJLENBQUNILFFBQVE7WUFDdEI7OztZQUVBSSxLQUFBQTttQkFBQUEsU0FBQUE7Z0JBQ0UsSUFBSUM7Z0JBRUosSUFBTUMsNEJBQTRCLElBQUksQ0FBQ1AsTUFBTSxFQUFFLEdBQUc7Z0JBRWxELElBQUksQ0FBQ0QsV0FBVyxDQUFDUyxLQUFLLENBQUMsQUFBQyxrQkFBMkMsT0FBMUJELDJCQUEwQjtnQkFFbkUsSUFBTUUsNkJBQTZCLElBQUksQ0FBQ1IsUUFBUSxDQUFDUyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUNYLFdBQVc7Z0JBRWxGLElBQUlVLDRCQUE0QjtvQkFDOUIsSUFBSSxDQUFDVixXQUFXLENBQUNZLFdBQVcsQ0FBQyxJQUFJLENBQUNWLFFBQVE7b0JBRTFDSyxXQUFXO2dCQUNiO2dCQUVBLElBQUlBLFVBQVU7b0JBQ1osSUFBSSxDQUFDUCxXQUFXLENBQUNhLEtBQUssQ0FBQyxBQUFDLG9CQUE2QyxPQUExQkwsMkJBQTBCO2dCQUN2RTtnQkFFQSxPQUFPRDtZQUNUOzs7O1lBRU9PLEtBQUFBO21CQUFQLFNBQU9BLDRCQUE0QkMsdUJBQXVCLEVBQUVmLFdBQVc7Z0JBQ3JFLElBQU0sQUFBRWdCLE9BQVNDLGFBQUksQ0FBYkQsTUFDRkUsV0FBV3BCLGNBQWNpQiwwQkFDekJJLE9BQU8sQUFBQ0QsYUFBYSxPQUNaRSxnQkFBVSxHQUNSSixLQUFLSyxZQUFZLENBQUNILFVBQVVsQixjQUN2Q0UsV0FBV29CLGlCQUFRLENBQUNSLDJCQUEyQixDQUFDQyx5QkFBeUJmLGNBQ3pFQyxTQUFTc0IsMEJBQTBCckIsVUFBVWlCLE9BQzdDSyxzQkFBc0IsSUFqRFgzQixvQkFpRG1DRyxhQUFhQyxRQUFRQztnQkFFekUsT0FBT3NCO1lBQ1Q7OztXQXBEbUIzQjs7QUF1RHJCLFNBQVMwQiwwQkFBMEJyQixRQUFRLEVBQUVpQixJQUFJO0lBQy9DLElBQUlsQjtJQUVKLElBQU13QixpQkFBaUJ2QixTQUFTRSxTQUFTO0lBRXpDLElBQUllLFNBQVMsTUFBTTtRQUNqQmxCLFNBQVN3QixnQkFBaUIsR0FBRztJQUMvQixPQUFPO1FBQ0wsSUFBTUMsYUFBYVAsS0FBS2YsU0FBUztRQUVqQ0gsU0FBUyxBQUFDLEdBQW9CeUIsT0FBbEJELGdCQUFlLEtBQWMsT0FBWEM7SUFDaEM7SUFFQSxPQUFPekI7QUFDVCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kZWNsYXJhdGlvbi92YXJpYWJsZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFZhcmlhYmxlIGZyb20gXCIuLi92YXJpYWJsZVwiO1xuXG5pbXBvcnQgeyBub2RlUXVlcnkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5pbXBvcnQgeyB0eXBlTmFtZUZyb21UeXBlTm9kZSB9IGZyb20gXCIuLi91dGlsaXRpZXMvbmFtZVwiO1xuXG5jb25zdCB0eXBlTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3ZhcmlhYmxlRGVjbGFyYXRpb24vdHlwZVwiKTtcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgVmFyaWFibGVEZWNsYXJhdGlvbiB7XG4gIGNvbnN0cnVjdG9yKGZpbGVDb250ZXh0LCBzdHJpbmcsIHZhcmlhYmxlKSB7XG4gICAgdGhpcy5maWxlQ29udGV4dCA9IGZpbGVDb250ZXh0O1xuICAgIHRoaXMuc3RyaW5nID0gc3RyaW5nO1xuICAgIHRoaXMudmFyaWFibGUgPSB2YXJpYWJsZTtcbiAgfVxuXG4gIGdldEZpbGVDb250ZXh0KCkge1xuICAgIHJldHVybiB0aGlzLmZpbGVDb250ZXh0O1xuICB9XG5cbiAgZ2V0U3RyaW5nKCkge1xuICAgIHJldHVybiB0aGlzLnN0cmluZztcbiAgfVxuXG4gIGdldFZhcmlhYmxlKCkge1xuICAgIHJldHVybiB0aGlzLnZhcmlhYmxlO1xuICB9XG5cbiAgdmVyaWZ5KCkge1xuICAgIGxldCB2ZXJpZmllZDtcblxuICAgIGNvbnN0IHZhcmlhYmxlRGVjbGFyYXRpb25TdHJpbmcgPSB0aGlzLnN0cmluZzsgLy8vXG5cbiAgICB0aGlzLmZpbGVDb250ZXh0LnRyYWNlKGBWZXJpZnlpbmcgdGhlICcke3ZhcmlhYmxlRGVjbGFyYXRpb25TdHJpbmd9JyB2YXJpYWJsZSBkZWNsYXJhdGlvbi4uLmApO1xuXG4gICAgY29uc3QgdmFyaWFibGVWZXJpZmllZEF0VG9wTGV2ZWwgPSB0aGlzLnZhcmlhYmxlLnZlcmlmeUF0VG9wTGV2ZWwodGhpcy5maWxlQ29udGV4dCk7XG5cbiAgICBpZiAodmFyaWFibGVWZXJpZmllZEF0VG9wTGV2ZWwpIHtcbiAgICAgIHRoaXMuZmlsZUNvbnRleHQuYWRkVmFyaWFibGUodGhpcy52YXJpYWJsZSk7XG5cbiAgICAgIHZlcmlmaWVkID0gdHJ1ZTtcbiAgICB9XG5cbiAgICBpZiAodmVyaWZpZWQpIHtcbiAgICAgIHRoaXMuZmlsZUNvbnRleHQuZGVidWcoYC4uLnZlcmlmaWVkIHRoZSAnJHt2YXJpYWJsZURlY2xhcmF0aW9uU3RyaW5nfScgdmFyaWFibGUgZGVjbGFyYXRpb24uYCk7XG4gICAgfVxuXG4gICAgcmV0dXJuIHZlcmlmaWVkO1xuICB9XG5cbiAgc3RhdGljIGZyb21WYXJpYWJsZURlY2xhcmF0aW9uTm9kZSh2YXJpYWJsZURlY2xhcmF0aW9uTm9kZSwgZmlsZUNvbnRleHQpIHtcbiAgICBjb25zdCB0eXBlTm9kZSA9IHR5cGVOb2RlUXVlcnkodmFyaWFibGVEZWNsYXJhdGlvbk5vZGUpLFxuICAgICAgICAgIHZhcmlhYmxlID0gVmFyaWFibGUuZnJvbVZhcmlhYmxlRGVjbGFyYXRpb25Ob2RlKHZhcmlhYmxlRGVjbGFyYXRpb25Ob2RlLCBmaWxlQ29udGV4dCksXG4gICAgICAgICAgc3RyaW5nID0gc3RyaW5nRnJvbVZhcmlhYmxlQW5kVHlwZU5vZGUodmFyaWFibGUsIHR5cGVOb2RlKSxcbiAgICAgICAgICB2YXJpYWJsZURlY2xhcmF0aW9uID0gbmV3IFZhcmlhYmxlRGVjbGFyYXRpb24oZmlsZUNvbnRleHQsIHN0cmluZywgdmFyaWFibGUpO1xuXG4gICAgcmV0dXJuIHZhcmlhYmxlRGVjbGFyYXRpb247XG4gIH1cbn1cblxuZnVuY3Rpb24gc3RyaW5nRnJvbVZhcmlhYmxlQW5kVHlwZU5vZGUodmFyaWFibGUsIHR5cGVOb2RlKSB7XG4gIGxldCBzdHJpbmc7XG5cbiAgY29uc3QgdmFyaWFibGVTdHJpbmcgPSB2YXJpYWJsZS5nZXRTdHJpbmcoKTtcblxuICBpZiAodHlwZU5vZGUgPT09IG51bGwpIHtcbiAgICBzdHJpbmcgPSB2YXJpYWJsZVN0cmluZzsgIC8vL1xuICB9IGVsc2Uge1xuICAgIGNvbnN0IHR5cGVOYW1lID0gdHlwZU5hbWVGcm9tVHlwZU5vZGUodHlwZU5vZGUpO1xuXG4gICAgc3RyaW5nID0gYCR7dmFyaWFibGVTdHJpbmd9OiR7dHlwZU5hbWV9YDtcbiAgfVxuXG4gIHJldHVybiBzdHJpbmc7XG59XG4iXSwibmFtZXMiOlsiVmFyaWFibGVEZWNsYXJhdGlvbiIsInR5cGVOb2RlUXVlcnkiLCJub2RlUXVlcnkiLCJmaWxlQ29udGV4dCIsInN0cmluZyIsInZhcmlhYmxlIiwiZ2V0RmlsZUNvbnRleHQiLCJnZXRTdHJpbmciLCJnZXRWYXJpYWJsZSIsInZlcmlmeSIsInZlcmlmaWVkIiwidmFyaWFibGVEZWNsYXJhdGlvblN0cmluZyIsInRyYWNlIiwidmFyaWFibGVWZXJpZmllZEF0VG9wTGV2ZWwiLCJ2ZXJpZnlBdFRvcExldmVsIiwiYWRkVmFyaWFibGUiLCJkZWJ1ZyIsImZyb21WYXJpYWJsZURlY2xhcmF0aW9uTm9kZSIsInZhcmlhYmxlRGVjbGFyYXRpb25Ob2RlIiwidHlwZU5vZGUiLCJWYXJpYWJsZSIsInN0cmluZ0Zyb21WYXJpYWJsZUFuZFR5cGVOb2RlIiwidmFyaWFibGVEZWNsYXJhdGlvbiIsInZhcmlhYmxlU3RyaW5nIiwidHlwZU5hbWUiLCJ0eXBlTmFtZUZyb21UeXBlTm9kZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7ZUFTcUJBOzs7K0RBUEE7cUJBRUs7b0JBQ1c7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFckMsSUFBTUMsZ0JBQWdCQyxJQUFBQSxnQkFBUyxFQUFDO0FBRWpCLElBQUEsQUFBTUYsb0NBQU47YUFBTUEsb0JBQ1BHLFdBQVcsRUFBRUMsTUFBTSxFQUFFQyxRQUFRO2dDQUR0Qkw7UUFFakIsSUFBSSxDQUFDRyxXQUFXLEdBQUdBO1FBQ25CLElBQUksQ0FBQ0MsTUFBTSxHQUFHQTtRQUNkLElBQUksQ0FBQ0MsUUFBUSxHQUFHQTs7a0JBSkNMOztZQU9uQk0sS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLE9BQU8sSUFBSSxDQUFDSCxXQUFXO1lBQ3pCOzs7WUFFQUksS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLE9BQU8sSUFBSSxDQUFDSCxNQUFNO1lBQ3BCOzs7WUFFQUksS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLE9BQU8sSUFBSSxDQUFDSCxRQUFRO1lBQ3RCOzs7WUFFQUksS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLElBQUlDO2dCQUVKLElBQU1DLDRCQUE0QixJQUFJLENBQUNQLE1BQU0sRUFBRSxHQUFHO2dCQUVsRCxJQUFJLENBQUNELFdBQVcsQ0FBQ1MsS0FBSyxDQUFDLEFBQUMsa0JBQTJDLE9BQTFCRCwyQkFBMEI7Z0JBRW5FLElBQU1FLDZCQUE2QixJQUFJLENBQUNSLFFBQVEsQ0FBQ1MsZ0JBQWdCLENBQUMsSUFBSSxDQUFDWCxXQUFXO2dCQUVsRixJQUFJVSw0QkFBNEI7b0JBQzlCLElBQUksQ0FBQ1YsV0FBVyxDQUFDWSxXQUFXLENBQUMsSUFBSSxDQUFDVixRQUFRO29CQUUxQ0ssV0FBVztnQkFDYjtnQkFFQSxJQUFJQSxVQUFVO29CQUNaLElBQUksQ0FBQ1AsV0FBVyxDQUFDYSxLQUFLLENBQUMsQUFBQyxvQkFBNkMsT0FBMUJMLDJCQUEwQjtnQkFDdkU7Z0JBRUEsT0FBT0Q7WUFDVDs7OztZQUVPTyxLQUFBQTttQkFBUCxTQUFPQSw0QkFBNEJDLHVCQUF1QixFQUFFZixXQUFXO2dCQUNyRSxJQUFNZ0IsV0FBV2xCLGNBQWNpQiwwQkFDekJiLFdBQVdlLGlCQUFRLENBQUNILDJCQUEyQixDQUFDQyx5QkFBeUJmLGNBQ3pFQyxTQUFTaUIsOEJBQThCaEIsVUFBVWMsV0FDakRHLHNCQUFzQixJQTdDWHRCLG9CQTZDbUNHLGFBQWFDLFFBQVFDO2dCQUV6RSxPQUFPaUI7WUFDVDs7O1dBaERtQnRCOztBQW1EckIsU0FBU3FCLDhCQUE4QmhCLFFBQVEsRUFBRWMsUUFBUTtJQUN2RCxJQUFJZjtJQUVKLElBQU1tQixpQkFBaUJsQixTQUFTRSxTQUFTO0lBRXpDLElBQUlZLGFBQWEsTUFBTTtRQUNyQmYsU0FBU21CLGdCQUFpQixHQUFHO0lBQy9CLE9BQU87UUFDTCxJQUFNQyxXQUFXQyxJQUFBQSwwQkFBb0IsRUFBQ047UUFFdENmLFNBQVMsQUFBQyxHQUFvQm9CLE9BQWxCRCxnQkFBZSxLQUFZLE9BQVRDO0lBQ2hDO0lBRUEsT0FBT3BCO0FBQ1QifQ==

package/lib/term.js

@@ -160,21 +160,17 @@ var Term = /*#__PURE__*/ function() {
             key: "verifyType",
             value: function verifyType(fileContext) {
                 var typeVerified;
-                if (this.type === null) {
-                    typeVerified = true;
+                var typeName = this.type.getName();
+                fileContext.trace("Verifying the '".concat(typeName, "' type..."));
+                var type = fileContext.findTypeByTypeName(typeName);
+                if (type === null) {
+                    fileContext.debug("The '".concat(typeName, "' type is missing."));
                 } else {
-                    var typeName = this.type.getName();
-                    fileContext.trace("Verifying the '".concat(typeName, "' type..."));
-                    var type = fileContext.findTypeByTypeName(typeName);
-                    if (type === null) {
-                        fileContext.debug("The '".concat(typeName, "' type is missing."));
-                    } else {
-                        this.type = type; ///
-                        typeVerified = true;
-                    }
-                    if (typeVerified) {
-                        fileContext.debug("...verified the '".concat(typeName, "' type."));
-                    }
+                    this.type = type; ///
+                    typeVerified = true;
+                }
+                if (typeVerified) {
+                    fileContext.debug("...verified the '".concat(typeName, "' type."));
                 }
                 return typeVerified;
             }
@@ -209,7 +205,8 @@ var Term = /*#__PURE__*/ function() {
                 fileContext.trace("Verifying the '".concat(termString, "' term at top level..."));
                 var termNode = this.node, termVerifiedAsConstructor = _termAsConstructor.default.verifyTerm(termNode, fileContext);
                 if (termVerifiedAsConstructor) {
-                    verifiedAtTopLevel = true;
+                    var typeVerified = this.verifyType(fileContext);
+                    verifiedAtTopLevel = typeVerified; ///
                 }
                 if (verifiedAtTopLevel) {
                     fileContext.debug("...verified the '".concat(termString, "' term at top level."), termNode);
@@ -220,7 +217,7 @@ var Term = /*#__PURE__*/ function() {
         {
             key: "toJSON",
             value: function toJSON() {
-                var typeJSON = this.type !== null ? this.type.toJSON() : null, string = this.string, type = typeJSON, json = {
+                var typeJSON = this.type.toJSON(), string = this.string, type = typeJSON, json = {
                     string: string,
                     type: type
                 };
@@ -263,4 +260,4 @@ function typeFromJSON(json, fileContext) {
     return type;
 }
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/term.js"],"sourcesContent":["\"use strict\";\n\nimport shim from \"./shim\";\nimport unifyMixins from \"./mixins/term/unify\";\nimport verifyMixins from \"./mixins/term/verify\";\nimport termAsConstructorVerifier from \"./verifier/termAsConstructor\";\n\nimport { filter } from \"./utilities/array\";\nimport { nodesQuery } from \"./utilities/query\"\nimport { termNodeFromTermString } from \"./utilities/node\";\n\nconst variableNodesQuery = nodesQuery(\"//variable\");\n\nclass Term {\n  constructor(string, node, type) {\n    this.string = string;\n    this.node = node;\n    this.type = type;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getNode() {\n    return this.node;\n  }\n\n  getType() {\n    return this.type;\n  }\n\n  setType(type) {\n    this.type = type;\n  }\n\n  match(term) {\n    const node = term.getNode(),\n          matches = this.node.match(node);\n\n    return matches;\n  }\n\n  getVariables(localContext) {\n    const variables = [],\n          variableNodes = variableNodesQuery(this.node);\n\n    variableNodes.forEach((variableNode) => {\n      const variable = localContext.findVariableByVariableNode(variableNode),\n            variablesIncludesVariable = variables.includes(variable);\n\n      if (!variablesIncludesVariable) {\n        variables.push(variable);\n      }\n    });\n\n    return variables;\n  }\n\n  isGrounded(definedVariables, localContext) {\n    const variables = this.getVariables(localContext);\n\n    filter(variables, (variable) => {\n      const definedVariablesIncludesVariable = definedVariables.includes(variable);\n\n      if (!definedVariablesIncludesVariable) {\n        return true;\n      }\n    });\n\n    const undefinedVariables = variables, ///\n          undefinedVariablesLength = undefinedVariables.length,\n          grounded = (undefinedVariablesLength <= 1);\n\n    return grounded;\n  }\n\n  matchTermNode(termNode) {\n    const termNodeMatches = this.node.match(termNode);\n\n    return termNodeMatches;\n  }\n\n  isInitiallyGrounded(localContext) {\n    const variables = this.getVariables(localContext),\n          variablesLength = variables.length,\n          initiallyGrounded = (variablesLength === 0);\n\n    return initiallyGrounded;\n  }\n\n  isImplicitlyGrounded(definedVariables, localContext) {\n    const grounded = this.isGrounded(definedVariables, localContext),\n          implicitlyGrounded = grounded;  ///\n\n    return implicitlyGrounded;\n  }\n\n  verify(localContext, verifyAhead) {\n    let verified = false;\n\n    const term = this, ///\n          termString = this.string;  ///\n\n    localContext.trace(`Verifying the '${termString}' term...`);\n\n    if (!verified) {\n      const unified = unifyMixins.some((unifyMixin) => { ///\n        const unified = unifyMixin(term, localContext, verifyAhead);\n\n        if (unified) {\n          return true;\n        }\n      });\n\n      verified = unified; ///\n    }\n\n    if (!verified) {\n      verified = verifyMixins.some((verifyMixin) => {\n        const verified = verifyMixin(term, localContext, verifyAhead);\n\n        if (verified) {\n          return true;\n        }\n      });\n    }\n\n    if (verified) {\n      localContext.debug(`...verified the '${termString}' term.`);\n    }\n\n    return verified;\n  }\n\n  verifyType(fileContext) {\n    let typeVerified;\n\n    if (this.type === null) {\n      typeVerified = true;\n    } else {\n      const typeName = this.type.getName();\n\n      fileContext.trace(`Verifying the '${typeName}' type...`);\n\n      const type = fileContext.findTypeByTypeName(typeName);\n\n      if (type === null) {\n        fileContext.debug(`The '${typeName}' type is missing.`);\n      } else {\n        this.type = type; ///\n\n        typeVerified = true;\n      }\n\n      if (typeVerified) {\n        fileContext.debug(`...verified the '${typeName}' type.`);\n      }\n    }\n\n    return typeVerified;\n  }\n\n  verifyGivenType(type, localContext) {\n    let verifiedGivenType;\n\n    const termString = this.getString(),\n          typeString = type.getString();\n\n    localContext.trace(`Verifying the '${termString}' term given the '${typeString}' type...`);\n\n    const verified = this.verify(localContext, () => {\n      let verifiedAhead;\n\n      const typeEqualToOrSubTypeOfGivenTypeType = this.type.isEqualToOrSubTypeOf(type);\n\n      if (typeEqualToOrSubTypeOfGivenTypeType) {\n        verifiedAhead = true;\n      }\n\n      return verifiedAhead;\n    });\n\n    verifiedGivenType = verified; ///\n\n    if (verifiedGivenType) {\n      localContext.debug(`...verified the '${termString}' term given the '${typeString}' type.`);\n    }\n\n    return verifiedGivenType;\n  }\n\n  verifyAtTopLevel(fileContext) {\n    let verifiedAtTopLevel;\n\n    const termString = this.string;  ///\n\n    fileContext.trace(`Verifying the '${termString}' term at top level...`);\n\n    const termNode = this.node,\n          termVerifiedAsConstructor = termAsConstructorVerifier.verifyTerm(termNode, fileContext);\n\n    if (termVerifiedAsConstructor) {\n      verifiedAtTopLevel = true;\n    }\n\n    if (verifiedAtTopLevel) {\n      fileContext.debug(`...verified the '${termString}' term at top level.`, termNode);\n    }\n\n    return verifiedAtTopLevel;\n  }\n\n  toJSON() {\n    const typeJSON = (this.type !== null) ?\n                       this.type.toJSON() :\n                         null,\n          string = this.string,\n          type = typeJSON,  ///\n          json = {\n            string,\n            type\n          };\n\n    return json;\n  }\n\n  static fromJSON(json, fileContext) {\n    const { string } = json,\n          termString = string,  ///\n          lexer = fileContext.getLexer(),\n          parser = fileContext.getParser(),\n          termNode = termNodeFromTermString(termString, lexer, parser),\n          node = termNode,  ///\n          type = typeFromJSON(json, fileContext),\n          term = new Term(string, node, type);\n\n    return term;\n  }\n\n  static fromTermNode(termNode, localContext) {\n    const node = termNode,  ///\n          string = localContext.nodeAsString(node),\n          type = null,\n          term = new Term(string, node, type);\n\n    return term;\n  }\n\n  static fromTermNodeAndType(termNode, type, fileContext) {\n    const node = termNode,  ///\n          string = fileContext.nodeAsString(node),\n          term = new Term(string, node, type);\n\n    return term;\n  }\n}\n\nObject.assign(shim, {\n  Term\n});\n\nexport default Term;\n\nfunction typeFromJSON(json, fileContext) {\n  let { type } = json;\n\n  const { name } = type,\n        typeName = name;  ///\n\n  type = fileContext.findTypeByTypeName(typeName);\n\n  return type;\n}\n"],"names":["variableNodesQuery","nodesQuery","Term","string","node","type","getString","getNode","getType","setType","match","term","matches","getVariables","localContext","variables","variableNodes","forEach","variableNode","variable","findVariableByVariableNode","variablesIncludesVariable","includes","push","isGrounded","definedVariables","filter","definedVariablesIncludesVariable","undefinedVariables","undefinedVariablesLength","length","grounded","matchTermNode","termNode","termNodeMatches","isInitiallyGrounded","variablesLength","initiallyGrounded","isImplicitlyGrounded","implicitlyGrounded","verify","verifyAhead","verified","termString","trace","unified","unifyMixins","some","unifyMixin","verifyMixins","verifyMixin","debug","verifyType","fileContext","typeVerified","typeName","getName","findTypeByTypeName","verifyGivenType","verifiedGivenType","typeString","verifiedAhead","typeEqualToOrSubTypeOfGivenTypeType","isEqualToOrSubTypeOf","verifyAtTopLevel","verifiedAtTopLevel","termVerifiedAsConstructor","termAsConstructorVerifier","verifyTerm","toJSON","typeJSON","json","fromJSON","lexer","getLexer","parser","getParser","termNodeFromTermString","typeFromJSON","fromTermNode","nodeAsString","fromTermNodeAndType","Object","assign","shim","name"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/term.js"],"sourcesContent":["\"use strict\";\n\nimport shim from \"./shim\";\nimport unifyMixins from \"./mixins/term/unify\";\nimport verifyMixins from \"./mixins/term/verify\";\nimport termAsConstructorVerifier from \"./verifier/termAsConstructor\";\n\nimport { filter } from \"./utilities/array\";\nimport { nodesQuery } from \"./utilities/query\"\nimport { termNodeFromTermString } from \"./utilities/node\";\n\nconst variableNodesQuery = nodesQuery(\"//variable\");\n\nclass Term {\n  constructor(string, node, type) {\n    this.string = string;\n    this.node = node;\n    this.type = type;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getNode() {\n    return this.node;\n  }\n\n  getType() {\n    return this.type;\n  }\n\n  setType(type) {\n    this.type = type;\n  }\n\n  match(term) {\n    const node = term.getNode(),\n          matches = this.node.match(node);\n\n    return matches;\n  }\n\n  getVariables(localContext) {\n    const variables = [],\n          variableNodes = variableNodesQuery(this.node);\n\n    variableNodes.forEach((variableNode) => {\n      const variable = localContext.findVariableByVariableNode(variableNode),\n            variablesIncludesVariable = variables.includes(variable);\n\n      if (!variablesIncludesVariable) {\n        variables.push(variable);\n      }\n    });\n\n    return variables;\n  }\n\n  isGrounded(definedVariables, localContext) {\n    const variables = this.getVariables(localContext);\n\n    filter(variables, (variable) => {\n      const definedVariablesIncludesVariable = definedVariables.includes(variable);\n\n      if (!definedVariablesIncludesVariable) {\n        return true;\n      }\n    });\n\n    const undefinedVariables = variables, ///\n          undefinedVariablesLength = undefinedVariables.length,\n          grounded = (undefinedVariablesLength <= 1);\n\n    return grounded;\n  }\n\n  matchTermNode(termNode) {\n    const termNodeMatches = this.node.match(termNode);\n\n    return termNodeMatches;\n  }\n\n  isInitiallyGrounded(localContext) {\n    const variables = this.getVariables(localContext),\n          variablesLength = variables.length,\n          initiallyGrounded = (variablesLength === 0);\n\n    return initiallyGrounded;\n  }\n\n  isImplicitlyGrounded(definedVariables, localContext) {\n    const grounded = this.isGrounded(definedVariables, localContext),\n          implicitlyGrounded = grounded;  ///\n\n    return implicitlyGrounded;\n  }\n\n  verify(localContext, verifyAhead) {\n    let verified = false;\n\n    const term = this, ///\n          termString = this.string;  ///\n\n    localContext.trace(`Verifying the '${termString}' term...`);\n\n    if (!verified) {\n      const unified = unifyMixins.some((unifyMixin) => { ///\n        const unified = unifyMixin(term, localContext, verifyAhead);\n\n        if (unified) {\n          return true;\n        }\n      });\n\n      verified = unified; ///\n    }\n\n    if (!verified) {\n      verified = verifyMixins.some((verifyMixin) => {\n        const verified = verifyMixin(term, localContext, verifyAhead);\n\n        if (verified) {\n          return true;\n        }\n      });\n    }\n\n    if (verified) {\n      localContext.debug(`...verified the '${termString}' term.`);\n    }\n\n    return verified;\n  }\n\n  verifyType(fileContext) {\n    let typeVerified;\n\n    const typeName = this.type.getName();\n\n    fileContext.trace(`Verifying the '${typeName}' type...`);\n\n    const type = fileContext.findTypeByTypeName(typeName);\n\n    if (type === null) {\n      fileContext.debug(`The '${typeName}' type is missing.`);\n    } else {\n      this.type = type; ///\n\n      typeVerified = true;\n    }\n\n    if (typeVerified) {\n      fileContext.debug(`...verified the '${typeName}' type.`);\n    }\n\n    return typeVerified;\n  }\n\n  verifyGivenType(type, localContext) {\n    let verifiedGivenType;\n\n    const termString = this.getString(),\n          typeString = type.getString();\n\n    localContext.trace(`Verifying the '${termString}' term given the '${typeString}' type...`);\n\n    const verified = this.verify(localContext, () => {\n      let verifiedAhead;\n\n      const typeEqualToOrSubTypeOfGivenTypeType = this.type.isEqualToOrSubTypeOf(type);\n\n      if (typeEqualToOrSubTypeOfGivenTypeType) {\n        verifiedAhead = true;\n      }\n\n      return verifiedAhead;\n    });\n\n    verifiedGivenType = verified; ///\n\n    if (verifiedGivenType) {\n      localContext.debug(`...verified the '${termString}' term given the '${typeString}' type.`);\n    }\n\n    return verifiedGivenType;\n  }\n\n  verifyAtTopLevel(fileContext) {\n    let verifiedAtTopLevel;\n\n    const termString = this.string;  ///\n\n    fileContext.trace(`Verifying the '${termString}' term at top level...`);\n\n    const termNode = this.node, ///\n          termVerifiedAsConstructor = termAsConstructorVerifier.verifyTerm(termNode, fileContext);\n\n    if (termVerifiedAsConstructor) {\n      const typeVerified = this.verifyType(fileContext);\n\n      verifiedAtTopLevel = typeVerified;  ///\n    }\n\n    if (verifiedAtTopLevel) {\n      fileContext.debug(`...verified the '${termString}' term at top level.`, termNode);\n    }\n\n    return verifiedAtTopLevel;\n  }\n\n  toJSON() {\n    const typeJSON = this.type.toJSON(),\n          string = this.string,\n          type = typeJSON,  ///\n          json = {\n            string,\n            type\n          };\n\n    return json;\n  }\n\n  static fromJSON(json, fileContext) {\n    const { string } = json,\n          termString = string,  ///\n          lexer = fileContext.getLexer(),\n          parser = fileContext.getParser(),\n          termNode = termNodeFromTermString(termString, lexer, parser),\n          node = termNode,  ///\n          type = typeFromJSON(json, fileContext),\n          term = new Term(string, node, type);\n\n    return term;\n  }\n\n  static fromTermNode(termNode, localContext) {\n    const node = termNode,  ///\n          string = localContext.nodeAsString(node),\n          type = null,\n          term = new Term(string, node, type);\n\n    return term;\n  }\n\n  static fromTermNodeAndType(termNode, type, fileContext) {\n    const node = termNode,  ///\n          string = fileContext.nodeAsString(node),\n          term = new Term(string, node, type);\n\n    return term;\n  }\n}\n\nObject.assign(shim, {\n  Term\n});\n\nexport default Term;\n\nfunction typeFromJSON(json, fileContext) {\n  let { type } = json;\n\n  const { name } = type,\n        typeName = name;  ///\n\n  type = fileContext.findTypeByTypeName(typeName);\n\n  return type;\n}\n"],"names":["variableNodesQuery","nodesQuery","Term","string","node","type","getString","getNode","getType","setType","match","term","matches","getVariables","localContext","variables","variableNodes","forEach","variableNode","variable","findVariableByVariableNode","variablesIncludesVariable","includes","push","isGrounded","definedVariables","filter","definedVariablesIncludesVariable","undefinedVariables","undefinedVariablesLength","length","grounded","matchTermNode","termNode","termNodeMatches","isInitiallyGrounded","variablesLength","initiallyGrounded","isImplicitlyGrounded","implicitlyGrounded","verify","verifyAhead","verified","termString","trace","unified","unifyMixins","some","unifyMixin","verifyMixins","verifyMixin","debug","verifyType","fileContext","typeVerified","typeName","getName","findTypeByTypeName","verifyGivenType","verifiedGivenType","typeString","verifiedAhead","typeEqualToOrSubTypeOfGivenTypeType","isEqualToOrSubTypeOf","verifyAtTopLevel","verifiedAtTopLevel","termVerifiedAsConstructor","termAsConstructorVerifier","verifyTerm","toJSON","typeJSON","json","fromJSON","lexer","getLexer","parser","getParser","termNodeFromTermString","typeFromJSON","fromTermNode","nodeAsString","fromTermNodeAndType","Object","assign","shim","name"],"mappings":"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"}

package/lib/type.js

@@ -219,9 +219,16 @@ var Type = /*#__PURE__*/ function() {
                 fileContext.trace("Verifying the '".concat(typeString, "' type..."));
                 var typePresent = fileContext.isTypePresentByTypeName(this.name);
                 if (typePresent) {
-                    verified = true;
+                    var superTypeName = this.superType.getName(), superType = fileContext.findTypeByTypeName(superTypeName);
+                    if (superType === null) {
+                        var superTypeString = this.superType.asString();
+                        fileContext.debug("The '".concat(superTypeString, "' super-type is not present."));
+                    } else {
+                        this.superType = superType;
+                        verified = true;
+                    }
                 } else {
-                    fileContext.debug("The type '".concat(typeString, "' is not present."));
+                    fileContext.debug("The '".concat(typeString, "' type is not present."));
                 }
                 if (verified) {
                     fileContext.debug("...verified the '".concat(typeString, "' type."));
@@ -257,7 +264,7 @@ var Type = /*#__PURE__*/ function() {
         {
             key: "toJSON",
             value: function toJSON() {
-                var superTypeJSON = this.superType !== null ? this.superType.toJSON() : null, name = this.name, superType = superTypeJSON, json = {
+                var superTypeJSON = this.superType.toJSON(), name = this.name, superType = superTypeJSON, json = {
                     name: name,
                     superType: superType
                 };
@@ -275,14 +282,20 @@ var Type = /*#__PURE__*/ function() {
         {
             key: "fromTypeNode",
             value: function fromTypeNode(typeNode) {
-                var typeName = (0, _name.typeNameFromTypeNode)(typeNode), name = typeName, string = name, superType = null, type = new Type(string, name, superType);
+                var type;
+                if (typeNode === null) {
+                    type = objectType;
+                } else {
+                    var typeName = (0, _name.typeNameFromTypeNode)(typeNode), name = typeName, string = name, superType = null;
+                    type = new Type(string, name, superType);
+                }
                 return type;
             }
         },
         {
             key: "fromTypeDeclarationNode",
             value: function fromTypeDeclarationNode(typeDeclarationNode, fileContext) {
-                var typeNode = typeNodeQuery(typeDeclarationNode), superTypeNode = superTypeNodeQuery(typeDeclarationNode), typeName = (0, _name.typeNameFromTypeNode)(typeNode), superType = superTypeNode === null ? objectType : Type.fromTypeNode(superTypeNode), string = stringFromTypeNameAndSuperType(typeName, superType), name = typeName, type = new Type(string, name, superType);
+                var typeNode = typeNodeQuery(typeDeclarationNode), superTypeNode = superTypeNodeQuery(typeDeclarationNode), typeName = (0, _name.typeNameFromTypeNode)(typeNode), superType = Type.fromTypeNode(superTypeNode), string = stringFromTypeNameAndSuperType(typeName, superType), name = typeName, type = new Type(string, name, superType);
                 return type;
             }
         }
@@ -328,4 +341,4 @@ function superTypeFromJSON(json, fileContext) {
     return superType;
 }
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/type.js"],"sourcesContent":["\"use strict\";\n\nimport shim from \"./shim\";\n\nimport { nodeQuery } from \"./utilities/query\";\nimport { OBJECT_TYPE_NAME } from \"./typeNames\";\nimport { typeNameFromTypeNode } from \"./utilities/name\";\n\nconst typeNodeQuery = nodeQuery(\"/typeDeclaration/type[0]\"),\n      superTypeNodeQuery = nodeQuery(\"/typeDeclaration/type[1]\");\n\nclass Type {\n  constructor(string, name, superType) {\n    this.string = string;\n    this.name = name;\n    this.superType = superType;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getName() {\n    return this.name;\n  }\n\n  getSuperType() {\n    return this.superType;\n  }\n\n  isEqualTo(type) {\n    const equalTo = (this === type);\n\n    return equalTo;\n  }\n\n  isSubTypeOf(type) {\n    let subTypeOf = false;\n\n    let superType = this.superType;\n\n    while (superType !== null) {\n      if (superType === type) {\n        subTypeOf = true;\n\n        break;\n      }\n\n      superType = superType.getSuperType();\n    }\n\n    return subTypeOf;\n  }\n\n  isSuperTypeOf(type) {\n    let superTypeOf = false;\n\n    let superType = type.getSuperType();\n\n    while (superType !== null) {\n      if (superType === this) {\n        superTypeOf = true;\n\n        break;\n      }\n\n      superType = superType.getSuperType();\n    }\n\n    return superTypeOf;\n  }\n\n  isComparableTo(type) {\n    const equalTo = this.isEqualTo(type),\n          subTypeOf = this.isSubTypeOf(type),\n          superTypeOf = this.isSuperTypeOf(type),\n          comparableTo = (equalTo || subTypeOf || superTypeOf);\n\n    return comparableTo;\n  }\n\n  isEqualToOrSubTypeOf(type) {\n    const equalTo = this.isEqualTo(type),\n          subTypeOf = this.isSubTypeOf(type),\n          equalToOrSubTypeOf = (equalTo || subTypeOf);\n\n    return equalToOrSubTypeOf;\n  }\n\n  isEqualToOrSuperTypeOf(type) {\n    const equalTo = this.isEqualTo(type),\n          superTypeOf = this.isSuperTypeOf(type),\n          equalToOrSuperTypeOf = (equalTo || superTypeOf);\n\n    return equalToOrSuperTypeOf;\n  }\n\n  match(type) {\n    const matches = (type === this);  ///\n\n    return matches;\n  }\n\n  matchName(name) {\n    const nodeMatches = (this.name === name);\n\n    return nodeMatches;\n  }\n\n  matchTypeName(typeName) {\n    const typeNameMatches = (this.name === typeName);\n\n    return typeNameMatches;\n  }\n\n  matchTypeNode(typeNode) {\n    const typeName = typeNameFromTypeNode(typeNode),\n          typeNameMatches = this.matchTypeName(typeName),\n          typeNodeMatches = typeNameMatches;  ///\n\n    return typeNodeMatches;\n  }\n\n  verify(fileContext) {\n    let verified = false;\n\n    const typeString = this.string; ///\n\n    fileContext.trace(`Verifying the '${typeString}' type...`);\n\n    const typePresent = fileContext.isTypePresentByTypeName(this.name);\n\n    if (typePresent) {\n      verified = true;\n    } else {\n      fileContext.debug(`The type '${typeString}' is not present.`);\n    }\n\n    if (verified) {\n      fileContext.debug(`...verified the '${typeString}' type.`);\n    }\n\n    return verified;\n  }\n\n  verifyAtTopLevel(fileContext) {\n    let verifiedAtTopLevel = false;\n\n    const typeString = this.string; ///\n\n    fileContext.trace(`Verifying the '${typeString}' type at top level...`);\n\n    const typePresent = fileContext.isTypePresentByTypeName(this.name);\n\n    if (typePresent) {\n      fileContext.debug(`The type '${typeString}' is already present.`);\n    } else {\n      const superTypeName = this.superType.getName(),\n            superType = fileContext.isTypePresentByTypeName(superTypeName);\n\n      if (superType === null) {\n        const superTypeString = this.superType.getString();\n\n        fileContext.debug(`The super-type '${superTypeString}' is not present.`);\n      } else {\n        this.superType = superType;\n\n        verifiedAtTopLevel = true;\n      }\n    }\n\n    if (verifiedAtTopLevel) {\n      fileContext.debug(`...verified the '${typeString}' type at top level.`);\n    }\n\n    return verifiedAtTopLevel;\n  }\n\n  toJSON() {\n    const superTypeJSON = (this.superType !== null) ?\n                            this.superType.toJSON() :\n                              null,\n          name = this.name,\n          superType = superTypeJSON,  ///\n          json = {\n            name,\n            superType\n          };\n\n    return json;\n  }\n\n  static fromJSON(json, fileContext) {\n    const { name } = json,\n          typeName = name,  ///\n          superType = superTypeFromJSON(json, fileContext),\n          string = stringFromTypeNameAndSuperType(typeName, superType),\n          type = new Type(string, name, superType);\n\n    return type;\n  }\n\n  static fromTypeNode(typeNode) {\n    const typeName = typeNameFromTypeNode(typeNode),\n          name = typeName,  ///\n          string = name,  ///\n          superType = null,\n          type = new Type(string, name, superType);\n\n    return type;\n  }\n\n  static fromTypeDeclarationNode(typeDeclarationNode, fileContext) {\n    const typeNode = typeNodeQuery(typeDeclarationNode),\n          superTypeNode = superTypeNodeQuery(typeDeclarationNode),\n          typeName = typeNameFromTypeNode(typeNode),\n          superType = (superTypeNode === null) ?\n                        objectType :\n                          Type.fromTypeNode(superTypeNode),\n          string = stringFromTypeNameAndSuperType(typeName, superType),\n          name = typeName,  ///\n          type = new Type(string, name, superType);\n\n    return type;\n  }\n}\n\nfunction stringFromTypeNameAndSuperType(typeName, superType) {\n  let string = typeName;  ///\n\n  if (superType !== null) {\n    const typeString = string,  ///\n          superTypeString = superType.getString();\n\n    string = `${typeString}:${superTypeString}`;\n  }\n\n  return string;\n}\n\nObject.assign(shim, {\n  Type\n});\n\nexport default Type;\n\nclass ObjectType extends Type {\n  static fromNothing() {\n    const name = OBJECT_TYPE_NAME,\n          string = name,  //\n          superType = null,\n          objectType = new ObjectType(string, name, superType);\n\n    return objectType;\n  }\n}\n\nexport const objectType = ObjectType.fromNothing();\n\nfunction superTypeFromJSON(json, fileContext) {\n  let { superType } = json;\n\n  const superTypeJSON = superType;  ///\n\n  json = superTypeJSON; ///\n\n  const { name } = json,\n        typeName = name,  ///\n        type = fileContext.findTypeByTypeName(typeName);\n\n  superType = type; ///\n\n  return superType;\n}\n"],"names":["objectType","typeNodeQuery","nodeQuery","superTypeNodeQuery","Type","string","name","superType","getString","getName","getSuperType","isEqualTo","type","equalTo","isSubTypeOf","subTypeOf","isSuperTypeOf","superTypeOf","isComparableTo","comparableTo","isEqualToOrSubTypeOf","equalToOrSubTypeOf","isEqualToOrSuperTypeOf","equalToOrSuperTypeOf","match","matches","matchName","nodeMatches","matchTypeName","typeName","typeNameMatches","matchTypeNode","typeNode","typeNameFromTypeNode","typeNodeMatches","verify","fileContext","verified","typeString","trace","typePresent","isTypePresentByTypeName","debug","verifyAtTopLevel","verifiedAtTopLevel","superTypeName","superTypeString","toJSON","superTypeJSON","json","fromJSON","superTypeFromJSON","stringFromTypeNameAndSuperType","fromTypeNode","fromTypeDeclarationNode","typeDeclarationNode","superTypeNode","Object","assign","shim","ObjectType","fromNothing","OBJECT_TYPE_NAME","findTypeByTypeName"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/type.js"],"sourcesContent":["\"use strict\";\n\nimport shim from \"./shim\";\n\nimport { nodeQuery } from \"./utilities/query\";\nimport { OBJECT_TYPE_NAME } from \"./typeNames\";\nimport { typeNameFromTypeNode } from \"./utilities/name\";\n\nconst typeNodeQuery = nodeQuery(\"/typeDeclaration/type[0]\"),\n      superTypeNodeQuery = nodeQuery(\"/typeDeclaration/type[1]\");\n\nclass Type {\n  constructor(string, name, superType) {\n    this.string = string;\n    this.name = name;\n    this.superType = superType;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getName() {\n    return this.name;\n  }\n\n  getSuperType() {\n    return this.superType;\n  }\n\n  isEqualTo(type) {\n    const equalTo = (this === type);\n\n    return equalTo;\n  }\n\n  isSubTypeOf(type) {\n    let subTypeOf = false;\n\n    let superType = this.superType;\n\n    while (superType !== null) {\n      if (superType === type) {\n        subTypeOf = true;\n\n        break;\n      }\n\n      superType = superType.getSuperType();\n    }\n\n    return subTypeOf;\n  }\n\n  isSuperTypeOf(type) {\n    let superTypeOf = false;\n\n    let superType = type.getSuperType();\n\n    while (superType !== null) {\n      if (superType === this) {\n        superTypeOf = true;\n\n        break;\n      }\n\n      superType = superType.getSuperType();\n    }\n\n    return superTypeOf;\n  }\n\n  isComparableTo(type) {\n    const equalTo = this.isEqualTo(type),\n          subTypeOf = this.isSubTypeOf(type),\n          superTypeOf = this.isSuperTypeOf(type),\n          comparableTo = (equalTo || subTypeOf || superTypeOf);\n\n    return comparableTo;\n  }\n\n  isEqualToOrSubTypeOf(type) {\n    const equalTo = this.isEqualTo(type),\n          subTypeOf = this.isSubTypeOf(type),\n          equalToOrSubTypeOf = (equalTo || subTypeOf);\n\n    return equalToOrSubTypeOf;\n  }\n\n  isEqualToOrSuperTypeOf(type) {\n    const equalTo = this.isEqualTo(type),\n          superTypeOf = this.isSuperTypeOf(type),\n          equalToOrSuperTypeOf = (equalTo || superTypeOf);\n\n    return equalToOrSuperTypeOf;\n  }\n\n  match(type) {\n    const matches = (type === this);  ///\n\n    return matches;\n  }\n\n  matchName(name) {\n    const nodeMatches = (this.name === name);\n\n    return nodeMatches;\n  }\n\n  matchTypeName(typeName) {\n    const typeNameMatches = (this.name === typeName);\n\n    return typeNameMatches;\n  }\n\n  matchTypeNode(typeNode) {\n    const typeName = typeNameFromTypeNode(typeNode),\n          typeNameMatches = this.matchTypeName(typeName),\n          typeNodeMatches = typeNameMatches;  ///\n\n    return typeNodeMatches;\n  }\n\n  verify(fileContext) {\n    let verified = false;\n\n    const typeString = this.string; ///\n\n    fileContext.trace(`Verifying the '${typeString}' type...`);\n\n    const typePresent = fileContext.isTypePresentByTypeName(this.name);\n\n    if (typePresent) {\n      const superTypeName = this.superType.getName(),\n            superType = fileContext.findTypeByTypeName(superTypeName);\n\n      if (superType === null) {\n        const superTypeString = this.superType.asString();\n\n        fileContext.debug(`The '${superTypeString}' super-type is not present.`);\n      } else {\n        this.superType = superType;\n\n        verified = true;\n      }\n    } else {\n      fileContext.debug(`The '${typeString}' type is not present.`);\n    }\n\n    if (verified) {\n      fileContext.debug(`...verified the '${typeString}' type.`);\n    }\n\n    return verified;\n  }\n\n  verifyAtTopLevel(fileContext) {\n    let verifiedAtTopLevel = false;\n\n    const typeString = this.string; ///\n\n    fileContext.trace(`Verifying the '${typeString}' type at top level...`);\n\n    const typePresent = fileContext.isTypePresentByTypeName(this.name);\n\n    if (typePresent) {\n      fileContext.debug(`The type '${typeString}' is already present.`);\n    } else {\n      const superTypeName = this.superType.getName(),\n            superType = fileContext.isTypePresentByTypeName(superTypeName);\n\n      if (superType === null) {\n        const superTypeString = this.superType.getString();\n\n        fileContext.debug(`The super-type '${superTypeString}' is not present.`);\n      } else {\n        this.superType = superType;\n\n        verifiedAtTopLevel = true;\n      }\n    }\n\n    if (verifiedAtTopLevel) {\n      fileContext.debug(`...verified the '${typeString}' type at top level.`);\n    }\n\n    return verifiedAtTopLevel;\n  }\n\n  toJSON() {\n    const superTypeJSON = this.superType.toJSON(),\n          name = this.name,\n          superType = superTypeJSON,  ///\n          json = {\n            name,\n            superType\n          };\n\n    return json;\n  }\n\n  static fromJSON(json, fileContext) {\n    const { name } = json,\n          typeName = name,  ///\n          superType = superTypeFromJSON(json, fileContext),\n          string = stringFromTypeNameAndSuperType(typeName, superType),\n          type = new Type(string, name, superType);\n\n    return type;\n  }\n\n  static fromTypeNode(typeNode) {\n    let type;\n\n    if (typeNode === null) {\n      type = objectType;\n    } else {\n      const typeName = typeNameFromTypeNode(typeNode),\n            name = typeName,  ///\n            string = name,  ///\n            superType = null;\n\n      type = new Type(string, name, superType);\n    }\n\n    return type;\n  }\n\n  static fromTypeDeclarationNode(typeDeclarationNode, fileContext) {\n    const typeNode = typeNodeQuery(typeDeclarationNode),\n          superTypeNode = superTypeNodeQuery(typeDeclarationNode),\n          typeName = typeNameFromTypeNode(typeNode),\n          superType = Type.fromTypeNode(superTypeNode),\n          string = stringFromTypeNameAndSuperType(typeName, superType),\n          name = typeName,  ///\n          type = new Type(string, name, superType);\n\n    return type;\n  }\n}\n\nfunction stringFromTypeNameAndSuperType(typeName, superType) {\n  let string = typeName;  ///\n\n  if (superType !== null) {\n    const typeString = string,  ///\n          superTypeString = superType.getString();\n\n    string = `${typeString}:${superTypeString}`;\n  }\n\n  return string;\n}\n\nObject.assign(shim, {\n  Type\n});\n\nexport default Type;\n\nclass ObjectType extends Type {\n  static fromNothing() {\n    const name = OBJECT_TYPE_NAME,\n          string = name,  //\n          superType = null,\n          objectType = new ObjectType(string, name, superType);\n\n    return objectType;\n  }\n}\n\nexport const objectType = ObjectType.fromNothing();\n\nfunction superTypeFromJSON(json, fileContext) {\n  let { superType } = json;\n\n  const superTypeJSON = superType;  ///\n\n  json = superTypeJSON; ///\n\n  const { name } = json,\n        typeName = name,  ///\n        type = fileContext.findTypeByTypeName(typeName);\n\n  superType = type; ///\n\n  return superType;\n}\n"],"names":["objectType","typeNodeQuery","nodeQuery","superTypeNodeQuery","Type","string","name","superType","getString","getName","getSuperType","isEqualTo","type","equalTo","isSubTypeOf","subTypeOf","isSuperTypeOf","superTypeOf","isComparableTo","comparableTo","isEqualToOrSubTypeOf","equalToOrSubTypeOf","isEqualToOrSuperTypeOf","equalToOrSuperTypeOf","match","matches","matchName","nodeMatches","matchTypeName","typeName","typeNameMatches","matchTypeNode","typeNode","typeNameFromTypeNode","typeNodeMatches","verify","fileContext","verified","typeString","trace","typePresent","isTypePresentByTypeName","superTypeName","findTypeByTypeName","superTypeString","asString","debug","verifyAtTopLevel","verifiedAtTopLevel","toJSON","superTypeJSON","json","fromJSON","superTypeFromJSON","stringFromTypeNameAndSuperType","fromTypeNode","fromTypeDeclarationNode","typeDeclarationNode","superTypeNode","Object","assign","shim","ObjectType","fromNothing","OBJECT_TYPE_NAME"],"mappings":"AAAA;;;;;;;;;;;IAkQA,OAAoB;eAApB;;IAaaA,UAAU;eAAVA;;;2DA7QI;qBAES;yBACO;oBACI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAErC,IAAMC,gBAAgBC,IAAAA,gBAAS,EAAC,6BAC1BC,qBAAqBD,IAAAA,gBAAS,EAAC;AAErC,IAAA,AAAME,qBAAN;aAAMA,KACQC,MAAM,EAAEC,IAAI,EAAEC,SAAS;gCAD/BH;QAEF,IAAI,CAACC,MAAM,GAAGA;QACd,IAAI,CAACC,IAAI,GAAGA;QACZ,IAAI,CAACC,SAAS,GAAGA;;kBAJfH;;YAOJI,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACH,MAAM;YACpB;;;YAEAI,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACH,IAAI;YAClB;;;YAEAI,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACH,SAAS;YACvB;;;YAEAI,KAAAA;mBAAAA,SAAAA,UAAUC,IAAI;gBACZ,IAAMC,UAAW,IAAI,KAAKD;gBAE1B,OAAOC;YACT;;;YAEAC,KAAAA;mBAAAA,SAAAA,YAAYF,IAAI;gBACd,IAAIG,YAAY;gBAEhB,IAAIR,YAAY,IAAI,CAACA,SAAS;gBAE9B,MAAOA,cAAc,KAAM;oBACzB,IAAIA,cAAcK,MAAM;wBACtBG,YAAY;wBAEZ;oBACF;oBAEAR,YAAYA,UAAUG,YAAY;gBACpC;gBAEA,OAAOK;YACT;;;YAEAC,KAAAA;mBAAAA,SAAAA,cAAcJ,IAAI;gBAChB,IAAIK,cAAc;gBAElB,IAAIV,YAAYK,KAAKF,YAAY;gBAEjC,MAAOH,cAAc,KAAM;oBACzB,IAAIA,cAAc,IAAI,EAAE;wBACtBU,cAAc;wBAEd;oBACF;oBAEAV,YAAYA,UAAUG,YAAY;gBACpC;gBAEA,OAAOO;YACT;;;YAEAC,KAAAA;mBAAAA,SAAAA,eAAeN,IAAI;gBACjB,IAAMC,UAAU,IAAI,CAACF,SAAS,CAACC,OACzBG,YAAY,IAAI,CAACD,WAAW,CAACF,OAC7BK,cAAc,IAAI,CAACD,aAAa,CAACJ,OACjCO,eAAgBN,WAAWE,aAAaE;gBAE9C,OAAOE;YACT;;;YAEAC,KAAAA;mBAAAA,SAAAA,qBAAqBR,IAAI;gBACvB,IAAMC,UAAU,IAAI,CAACF,SAAS,CAACC,OACzBG,YAAY,IAAI,CAACD,WAAW,CAACF,OAC7BS,qBAAsBR,WAAWE;gBAEvC,OAAOM;YACT;;;YAEAC,KAAAA;mBAAAA,SAAAA,uBAAuBV,IAAI;gBACzB,IAAMC,UAAU,IAAI,CAACF,SAAS,CAACC,OACzBK,cAAc,IAAI,CAACD,aAAa,CAACJ,OACjCW,uBAAwBV,WAAWI;gBAEzC,OAAOM;YACT;;;YAEAC,KAAAA;mBAAAA,SAAAA,MAAMZ,IAAI;gBACR,IAAMa,UAAWb,SAAS,IAAI,EAAI,GAAG;gBAErC,OAAOa;YACT;;;YAEAC,KAAAA;mBAAAA,SAAAA,UAAUpB,IAAI;gBACZ,IAAMqB,cAAe,IAAI,CAACrB,IAAI,KAAKA;gBAEnC,OAAOqB;YACT;;;YAEAC,KAAAA;mBAAAA,SAAAA,cAAcC,QAAQ;gBACpB,IAAMC,kBAAmB,IAAI,CAACxB,IAAI,KAAKuB;gBAEvC,OAAOC;YACT;;;YAEAC,KAAAA;mBAAAA,SAAAA,cAAcC,QAAQ;gBACpB,IAAMH,WAAWI,IAAAA,0BAAoB,EAACD,WAChCF,kBAAkB,IAAI,CAACF,aAAa,CAACC,WACrCK,kBAAkBJ,iBAAkB,GAAG;gBAE7C,OAAOI;YACT;;;YAEAC,KAAAA;mBAAAA,SAAAA,OAAOC,WAAW;gBAChB,IAAIC,WAAW;gBAEf,IAAMC,aAAa,IAAI,CAACjC,MAAM,EAAE,GAAG;gBAEnC+B,YAAYG,KAAK,CAAC,AAAC,kBAA4B,OAAXD,YAAW;gBAE/C,IAAME,cAAcJ,YAAYK,uBAAuB,CAAC,IAAI,CAACnC,IAAI;gBAEjE,IAAIkC,aAAa;oBACf,IAAME,gBAAgB,IAAI,CAACnC,SAAS,CAACE,OAAO,IACtCF,YAAY6B,YAAYO,kBAAkB,CAACD;oBAEjD,IAAInC,cAAc,MAAM;wBACtB,IAAMqC,kBAAkB,IAAI,CAACrC,SAAS,CAACsC,QAAQ;wBAE/CT,YAAYU,KAAK,CAAC,AAAC,QAAuB,OAAhBF,iBAAgB;oBAC5C,OAAO;wBACL,IAAI,CAACrC,SAAS,GAAGA;wBAEjB8B,WAAW;oBACb;gBACF,OAAO;oBACLD,YAAYU,KAAK,CAAC,AAAC,QAAkB,OAAXR,YAAW;gBACvC;gBAEA,IAAID,UAAU;oBACZD,YAAYU,KAAK,CAAC,AAAC,oBAA8B,OAAXR,YAAW;gBACnD;gBAEA,OAAOD;YACT;;;YAEAU,KAAAA;mBAAAA,SAAAA,iBAAiBX,WAAW;gBAC1B,IAAIY,qBAAqB;gBAEzB,IAAMV,aAAa,IAAI,CAACjC,MAAM,EAAE,GAAG;gBAEnC+B,YAAYG,KAAK,CAAC,AAAC,kBAA4B,OAAXD,YAAW;gBAE/C,IAAME,cAAcJ,YAAYK,uBAAuB,CAAC,IAAI,CAACnC,IAAI;gBAEjE,IAAIkC,aAAa;oBACfJ,YAAYU,KAAK,CAAC,AAAC,aAAuB,OAAXR,YAAW;gBAC5C,OAAO;oBACL,IAAMI,gBAAgB,IAAI,CAACnC,SAAS,CAACE,OAAO,IACtCF,YAAY6B,YAAYK,uBAAuB,CAACC;oBAEtD,IAAInC,cAAc,MAAM;wBACtB,IAAMqC,kBAAkB,IAAI,CAACrC,SAAS,CAACC,SAAS;wBAEhD4B,YAAYU,KAAK,CAAC,AAAC,mBAAkC,OAAhBF,iBAAgB;oBACvD,OAAO;wBACL,IAAI,CAACrC,SAAS,GAAGA;wBAEjByC,qBAAqB;oBACvB;gBACF;gBAEA,IAAIA,oBAAoB;oBACtBZ,YAAYU,KAAK,CAAC,AAAC,oBAA8B,OAAXR,YAAW;gBACnD;gBAEA,OAAOU;YACT;;;YAEAC,KAAAA;mBAAAA,SAAAA;gBACE,IAAMC,gBAAgB,IAAI,CAAC3C,SAAS,CAAC0C,MAAM,IACrC3C,OAAO,IAAI,CAACA,IAAI,EAChBC,YAAY2C,eACZC,OAAO;oBACL7C,MAAAA;oBACAC,WAAAA;gBACF;gBAEN,OAAO4C;YACT;;;;YAEOC,KAAAA;mBAAP,SAAOA,SAASD,IAAI,EAAEf,WAAW;gBAC/B,IAAM,AAAE9B,OAAS6C,KAAT7C,MACFuB,WAAWvB,MACXC,YAAY8C,kBAAkBF,MAAMf,cACpC/B,SAASiD,+BAA+BzB,UAAUtB,YAClDK,OAAO,IAnMXR,KAmMoBC,QAAQC,MAAMC;gBAEpC,OAAOK;YACT;;;YAEO2C,KAAAA;mBAAP,SAAOA,aAAavB,QAAQ;gBAC1B,IAAIpB;gBAEJ,IAAIoB,aAAa,MAAM;oBACrBpB,OAAOZ;gBACT,OAAO;oBACL,IAAM6B,WAAWI,IAAAA,0BAAoB,EAACD,WAChC1B,OAAOuB,UACPxB,SAASC,MACTC,YAAY;oBAElBK,OAAO,IAnNPR,KAmNgBC,QAAQC,MAAMC;gBAChC;gBAEA,OAAOK;YACT;;;YAEO4C,KAAAA;mBAAP,SAAOA,wBAAwBC,mBAAmB,EAAErB,WAAW;gBAC7D,IAAMJ,WAAW/B,cAAcwD,sBACzBC,gBAAgBvD,mBAAmBsD,sBACnC5B,WAAWI,IAAAA,0BAAoB,EAACD,WAChCzB,YAAYH,AA7NhBA,KA6NqBmD,YAAY,CAACG,gBAC9BrD,SAASiD,+BAA+BzB,UAAUtB,YAClDD,OAAOuB,UACPjB,OAAO,IAhOXR,KAgOoBC,QAAQC,MAAMC;gBAEpC,OAAOK;YACT;;;WAnOIR;;AAsON,SAASkD,+BAA+BzB,QAAQ,EAAEtB,SAAS;IACzD,IAAIF,SAASwB,UAAW,GAAG;IAE3B,IAAItB,cAAc,MAAM;QACtB,IAAM+B,aAAajC,QACbuC,kBAAkBrC,UAAUC,SAAS;QAE3CH,SAAS,AAAC,GAAgBuC,OAAdN,YAAW,KAAmB,OAAhBM;IAC5B;IAEA,OAAOvC;AACT;AAEAsD,OAAOC,MAAM,CAACC,aAAI,EAAE;IAClBzD,MAAAA;AACF;IAEA,WAAeA;AAEf,IAAA,AAAM0D,2BAAN;cAAMA;aAAAA;gCAAAA;iCAAAA;;kBAAAA;;YACGC,KAAAA;mBAAP,SAAOA;gBACL,IAAMzD,OAAO0D,2BAAgB,EACvB3D,SAASC,MACTC,YAAY,MACZP,aAAa,IALjB8D,WAKgCzD,QAAQC,MAAMC;gBAEhD,OAAOP;YACT;;;WARI8D;EAAmB1D;AAWlB,IAAMJ,aAAa8D,WAAWC,WAAW;AAEhD,SAASV,kBAAkBF,IAAI,EAAEf,WAAW;IAC1C,IAAI,AAAE7B,YAAc4C,KAAd5C;IAEN,IAAM2C,gBAAgB3C,WAAY,GAAG;IAErC4C,OAAOD,eAAe,GAAG;IAEzB,IAAM,AAAE5C,OAAS6C,KAAT7C,MACFuB,WAAWvB,MACXM,OAAOwB,YAAYO,kBAAkB,CAACd;IAE5CtB,YAAYK,MAAM,GAAG;IAErB,OAAOL;AACT"}

package/lib/unifier/metavariable.js

@@ -11,6 +11,7 @@ Object.defineProperty(exports, "default", {
 var _shim = /*#__PURE__*/ _interop_require_default(require("../shim"));
 var _unifier = /*#__PURE__*/ _interop_require_default(require("../unifier"));
 var _query = require("../utilities/query");
+var _name = require("../utilities/name");
 function _assert_this_initialized(self) {
     if (self === void 0) {
         throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
@@ -128,8 +129,8 @@ _define_property(MetavariableUnifier, "maps", [
         nodeQueryB: typeNodeQuery,
         unify: function(termNodeA, typeNodeB, localContext) {
             var unified = false;
-            var Term = _shim.default.Term, Type = _shim.default.Type, typeNode = typeNodeB, type = Type.fromTypeNode(typeNode, localContext), typeVerified = type.verify(localContext);
-            if (typeVerified) {
+            var Term = _shim.default.Term, typeNode = typeNodeB, typeName = (0, _name.typeNameFromTypeNode)(typeNode), type = localContext.findTypeByTypeName(typeName);
+            if (type !== null) {
                 var termNode = termNodeA, term = Term.fromTermNode(termNode, localContext), termVerifiedGivenType = term.verifyGivenType(type, localContext);
                 if (termVerifiedGivenType) {
                     unified = true;
@@ -142,4 +143,4 @@ _define_property(MetavariableUnifier, "maps", [
 var metavariableUnifier = new MetavariableUnifier();
 var _default = metavariableUnifier;
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91bmlmaWVyL21ldGF2YXJpYWJsZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHNoaW0gZnJvbSBcIi4uL3NoaW1cIjtcbmltcG9ydCBVbmlmaWVyIGZyb20gXCIuLi91bmlmaWVyXCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuY29uc3QgdHlwZU5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi90eXBlIVwiKSxcbiAgICAgIHRlcm1Ob2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvdGVybSFcIik7XG5cbmNsYXNzIE1ldGF2YXJpYWJsZVVuaWZpZXIgZXh0ZW5kcyBVbmlmaWVyIHtcbiAgdW5pZnkobWV0YXZhcmlhYmxlTm9kZUEsIG1ldGF2YXJpYWJsZU5vZGVCLCBsb2NhbENvbnRleHQpIHtcbiAgICBsZXQgdW5pZmllZDtcblxuICAgIGNvbnN0IG5vblRlcm1pbmFsTm9kZUEgPSBtZXRhdmFyaWFibGVOb2RlQSwgLy8vXG4gICAgICAgICAgbm9uVGVybWluYWxOb2RlQiA9IG1ldGF2YXJpYWJsZU5vZGVCLCAvLy9cbiAgICAgICAgICBub25UZXJtaW5hbE5vZGVVbmlmaWVkID0gdGhpcy51bmlmeU5vblRlcm1pbmFsTm9kZShub25UZXJtaW5hbE5vZGVBLCBub25UZXJtaW5hbE5vZGVCLCBsb2NhbENvbnRleHQpO1xuXG4gICAgdW5pZmllZCA9IG5vblRlcm1pbmFsTm9kZVVuaWZpZWQ7IC8vL1xuXG4gICAgcmV0dXJuIHVuaWZpZWQ7XG4gIH1cblxuICBzdGF0aWMgbWFwcyA9IFtcbiAgICB7XG4gICAgICBub2RlUXVlcnlBOiB0ZXJtTm9kZVF1ZXJ5LFxuICAgICAgbm9kZVF1ZXJ5QjogdHlwZU5vZGVRdWVyeSxcbiAgICAgIHVuaWZ5OiAodGVybU5vZGVBLCB0eXBlTm9kZUIsIGxvY2FsQ29udGV4dCkgPT4ge1xuICAgICAgICBsZXQgdW5pZmllZCA9IGZhbHNlO1xuXG4gICAgICAgIGNvbnN0IHsgVGVybSwgVHlwZSB9ID0gc2hpbSxcbiAgICAgICAgICAgICAgdHlwZU5vZGUgPSB0eXBlTm9kZUIsIC8vL1xuICAgICAgICAgICAgICB0eXBlID0gVHlwZS5mcm9tVHlwZU5vZGUodHlwZU5vZGUsIGxvY2FsQ29udGV4dCksXG4gICAgICAgICAgICAgIHR5cGVWZXJpZmllZCA9IHR5cGUudmVyaWZ5KGxvY2FsQ29udGV4dCk7XG5cbiAgICAgICAgaWYgKHR5cGVWZXJpZmllZCkge1xuICAgICAgICAgIGNvbnN0IHRlcm1Ob2RlID0gdGVybU5vZGVBLCAvLy9cbiAgICAgICAgICAgICAgICB0ZXJtID0gVGVybS5mcm9tVGVybU5vZGUodGVybU5vZGUsIGxvY2FsQ29udGV4dCksXG4gICAgICAgICAgICAgICAgdGVybVZlcmlmaWVkR2l2ZW5UeXBlID0gdGVybS52ZXJpZnlHaXZlblR5cGUodHlwZSwgbG9jYWxDb250ZXh0KTtcblxuICAgICAgICAgIGlmICh0ZXJtVmVyaWZpZWRHaXZlblR5cGUpIHtcbiAgICAgICAgICAgIHVuaWZpZWQgPSB0cnVlO1xuICAgICAgICAgIH1cbiAgICAgICAgfVxuXG4gICAgICAgIHJldHVybiB1bmlmaWVkO1xuICAgICAgfVxuICAgIH1cbiAgXTtcbn1cblxuY29uc3QgbWV0YXZhcmlhYmxlVW5pZmllciA9IG5ldyBNZXRhdmFyaWFibGVVbmlmaWVyKCk7XG5cbmV4cG9ydCBkZWZhdWx0IG1ldGF2YXJpYWJsZVVuaWZpZXI7XG4iXSwibmFtZXMiOlsidHlwZU5vZGVRdWVyeSIsIm5vZGVRdWVyeSIsInRlcm1Ob2RlUXVlcnkiLCJNZXRhdmFyaWFibGVVbmlmaWVyIiwidW5pZnkiLCJtZXRhdmFyaWFibGVOb2RlQSIsIm1ldGF2YXJpYWJsZU5vZGVCIiwibG9jYWxDb250ZXh0IiwidW5pZmllZCIsIm5vblRlcm1pbmFsTm9kZUEiLCJub25UZXJtaW5hbE5vZGVCIiwibm9uVGVybWluYWxOb2RlVW5pZmllZCIsInVuaWZ5Tm9uVGVybWluYWxOb2RlIiwiVW5pZmllciIsIm1hcHMiLCJub2RlUXVlcnlBIiwibm9kZVF1ZXJ5QiIsInRlcm1Ob2RlQSIsInR5cGVOb2RlQiIsIlRlcm0iLCJzaGltIiwiVHlwZSIsInR5cGVOb2RlIiwidHlwZSIsImZyb21UeXBlTm9kZSIsInR5cGVWZXJpZmllZCIsInZlcmlmeSIsInRlcm1Ob2RlIiwidGVybSIsImZyb21UZXJtTm9kZSIsInRlcm1WZXJpZmllZEdpdmVuVHlwZSIsInZlcmlmeUdpdmVuVHlwZSIsIm1ldGF2YXJpYWJsZVVuaWZpZXIiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQXFEQTs7O2VBQUE7OzsyREFuRGlCOzhEQUNHO3FCQUVNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUUxQixJQUFNQSxnQkFBZ0JDLElBQUFBLGdCQUFTLEVBQUMsV0FDMUJDLGdCQUFnQkQsSUFBQUEsZ0JBQVMsRUFBQztBQUVoQyxJQUFBLEFBQU1FLG9DQUFOO2NBQU1BO2FBQUFBO2dDQUFBQTtpQ0FBQUE7O2tCQUFBQTs7WUFDSkMsS0FBQUE7bUJBQUFBLFNBQUFBLE1BQU1DLGlCQUFpQixFQUFFQyxpQkFBaUIsRUFBRUMsWUFBWTtnQkFDdEQsSUFBSUM7Z0JBRUosSUFBTUMsbUJBQW1CSixtQkFDbkJLLG1CQUFtQkosbUJBQ25CSyx5QkFBeUIsSUFBSSxDQUFDQyxvQkFBb0IsQ0FBQ0gsa0JBQWtCQyxrQkFBa0JIO2dCQUU3RkMsVUFBVUcsd0JBQXdCLEdBQUc7Z0JBRXJDLE9BQU9IO1lBQ1Q7OztXQVhJTDtFQUE0QlUsZ0JBQU87QUFhdkMsaUJBYklWLHFCQWFHVyxRQUFPO0lBQ1o7UUFDRUMsWUFBWWI7UUFDWmMsWUFBWWhCO1FBQ1pJLE9BQU8sU0FBQ2EsV0FBV0MsV0FBV1g7WUFDNUIsSUFBSUMsVUFBVTtZQUVkLElBQVFXLE9BQWVDLGFBQUksQ0FBbkJELE1BQU1FLE9BQVNELGFBQUksQ0FBYkMsTUFDUkMsV0FBV0osV0FDWEssT0FBT0YsS0FBS0csWUFBWSxDQUFDRixVQUFVZixlQUNuQ2tCLGVBQWVGLEtBQUtHLE1BQU0sQ0FBQ25CO1lBRWpDLElBQUlrQixjQUFjO2dCQUNoQixJQUFNRSxXQUFXVixXQUNYVyxPQUFPVCxLQUFLVSxZQUFZLENBQUNGLFVBQVVwQixlQUNuQ3VCLHdCQUF3QkYsS0FBS0csZUFBZSxDQUFDUixNQUFNaEI7Z0JBRXpELElBQUl1Qix1QkFBdUI7b0JBQ3pCdEIsVUFBVTtnQkFDWjtZQUNGO1lBRUEsT0FBT0E7UUFDVDtJQUNGO0NBQ0Q7QUFHSCxJQUFNd0Isc0JBQXNCLElBQUk3QjtJQUVoQyxXQUFlNkIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91bmlmaWVyL21ldGF2YXJpYWJsZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHNoaW0gZnJvbSBcIi4uL3NoaW1cIjtcbmltcG9ydCBVbmlmaWVyIGZyb20gXCIuLi91bmlmaWVyXCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcbmltcG9ydCB7IHR5cGVOYW1lRnJvbVR5cGVOb2RlIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9uYW1lXCI7XG5cbmNvbnN0IHR5cGVOb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvdHlwZSFcIiksXG4gICAgICB0ZXJtTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3Rlcm0hXCIpO1xuXG5jbGFzcyBNZXRhdmFyaWFibGVVbmlmaWVyIGV4dGVuZHMgVW5pZmllciB7XG4gIHVuaWZ5KG1ldGF2YXJpYWJsZU5vZGVBLCBtZXRhdmFyaWFibGVOb2RlQiwgbG9jYWxDb250ZXh0KSB7XG4gICAgbGV0IHVuaWZpZWQ7XG5cbiAgICBjb25zdCBub25UZXJtaW5hbE5vZGVBID0gbWV0YXZhcmlhYmxlTm9kZUEsIC8vL1xuICAgICAgICAgIG5vblRlcm1pbmFsTm9kZUIgPSBtZXRhdmFyaWFibGVOb2RlQiwgLy8vXG4gICAgICAgICAgbm9uVGVybWluYWxOb2RlVW5pZmllZCA9IHRoaXMudW5pZnlOb25UZXJtaW5hbE5vZGUobm9uVGVybWluYWxOb2RlQSwgbm9uVGVybWluYWxOb2RlQiwgbG9jYWxDb250ZXh0KTtcblxuICAgIHVuaWZpZWQgPSBub25UZXJtaW5hbE5vZGVVbmlmaWVkOyAvLy9cblxuICAgIHJldHVybiB1bmlmaWVkO1xuICB9XG5cbiAgc3RhdGljIG1hcHMgPSBbXG4gICAge1xuICAgICAgbm9kZVF1ZXJ5QTogdGVybU5vZGVRdWVyeSxcbiAgICAgIG5vZGVRdWVyeUI6IHR5cGVOb2RlUXVlcnksXG4gICAgICB1bmlmeTogKHRlcm1Ob2RlQSwgdHlwZU5vZGVCLCBsb2NhbENvbnRleHQpID0+IHtcbiAgICAgICAgbGV0IHVuaWZpZWQgPSBmYWxzZTtcblxuICAgICAgICBjb25zdCB7IFRlcm0gfSA9IHNoaW0sXG4gICAgICAgICAgICAgIHR5cGVOb2RlID0gdHlwZU5vZGVCLCAvLy9cbiAgICAgICAgICAgICAgdHlwZU5hbWUgPSB0eXBlTmFtZUZyb21UeXBlTm9kZSh0eXBlTm9kZSksXG4gICAgICAgICAgICAgIHR5cGUgPSBsb2NhbENvbnRleHQuZmluZFR5cGVCeVR5cGVOYW1lKHR5cGVOYW1lKTtcblxuICAgICAgICBpZiAodHlwZSAhPT0gbnVsbCkge1xuICAgICAgICAgIGNvbnN0IHRlcm1Ob2RlID0gdGVybU5vZGVBLCAvLy9cbiAgICAgICAgICAgICAgICB0ZXJtID0gVGVybS5mcm9tVGVybU5vZGUodGVybU5vZGUsIGxvY2FsQ29udGV4dCksXG4gICAgICAgICAgICAgICAgdGVybVZlcmlmaWVkR2l2ZW5UeXBlID0gdGVybS52ZXJpZnlHaXZlblR5cGUodHlwZSwgbG9jYWxDb250ZXh0KTtcblxuICAgICAgICAgIGlmICh0ZXJtVmVyaWZpZWRHaXZlblR5cGUpIHtcbiAgICAgICAgICAgIHVuaWZpZWQgPSB0cnVlO1xuICAgICAgICAgIH1cbiAgICAgICAgfVxuXG4gICAgICAgIHJldHVybiB1bmlmaWVkO1xuICAgICAgfVxuICAgIH1cbiAgXTtcbn1cblxuY29uc3QgbWV0YXZhcmlhYmxlVW5pZmllciA9IG5ldyBNZXRhdmFyaWFibGVVbmlmaWVyKCk7XG5cbmV4cG9ydCBkZWZhdWx0IG1ldGF2YXJpYWJsZVVuaWZpZXI7XG4iXSwibmFtZXMiOlsidHlwZU5vZGVRdWVyeSIsIm5vZGVRdWVyeSIsInRlcm1Ob2RlUXVlcnkiLCJNZXRhdmFyaWFibGVVbmlmaWVyIiwidW5pZnkiLCJtZXRhdmFyaWFibGVOb2RlQSIsIm1ldGF2YXJpYWJsZU5vZGVCIiwibG9jYWxDb250ZXh0IiwidW5pZmllZCIsIm5vblRlcm1pbmFsTm9kZUEiLCJub25UZXJtaW5hbE5vZGVCIiwibm9uVGVybWluYWxOb2RlVW5pZmllZCIsInVuaWZ5Tm9uVGVybWluYWxOb2RlIiwiVW5pZmllciIsIm1hcHMiLCJub2RlUXVlcnlBIiwibm9kZVF1ZXJ5QiIsInRlcm1Ob2RlQSIsInR5cGVOb2RlQiIsIlRlcm0iLCJzaGltIiwidHlwZU5vZGUiLCJ0eXBlTmFtZSIsInR5cGVOYW1lRnJvbVR5cGVOb2RlIiwidHlwZSIsImZpbmRUeXBlQnlUeXBlTmFtZSIsInRlcm1Ob2RlIiwidGVybSIsImZyb21UZXJtTm9kZSIsInRlcm1WZXJpZmllZEdpdmVuVHlwZSIsInZlcmlmeUdpdmVuVHlwZSIsIm1ldGF2YXJpYWJsZVVuaWZpZXIiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQXNEQTs7O2VBQUE7OzsyREFwRGlCOzhEQUNHO3FCQUVNO29CQUNXOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVyQyxJQUFNQSxnQkFBZ0JDLElBQUFBLGdCQUFTLEVBQUMsV0FDMUJDLGdCQUFnQkQsSUFBQUEsZ0JBQVMsRUFBQztBQUVoQyxJQUFBLEFBQU1FLG9DQUFOO2NBQU1BO2FBQUFBO2dDQUFBQTtpQ0FBQUE7O2tCQUFBQTs7WUFDSkMsS0FBQUE7bUJBQUFBLFNBQUFBLE1BQU1DLGlCQUFpQixFQUFFQyxpQkFBaUIsRUFBRUMsWUFBWTtnQkFDdEQsSUFBSUM7Z0JBRUosSUFBTUMsbUJBQW1CSixtQkFDbkJLLG1CQUFtQkosbUJBQ25CSyx5QkFBeUIsSUFBSSxDQUFDQyxvQkFBb0IsQ0FBQ0gsa0JBQWtCQyxrQkFBa0JIO2dCQUU3RkMsVUFBVUcsd0JBQXdCLEdBQUc7Z0JBRXJDLE9BQU9IO1lBQ1Q7OztXQVhJTDtFQUE0QlUsZ0JBQU87QUFhdkMsaUJBYklWLHFCQWFHVyxRQUFPO0lBQ1o7UUFDRUMsWUFBWWI7UUFDWmMsWUFBWWhCO1FBQ1pJLE9BQU8sU0FBQ2EsV0FBV0MsV0FBV1g7WUFDNUIsSUFBSUMsVUFBVTtZQUVkLElBQU0sQUFBRVcsT0FBU0MsYUFBSSxDQUFiRCxNQUNGRSxXQUFXSCxXQUNYSSxXQUFXQyxJQUFBQSwwQkFBb0IsRUFBQ0YsV0FDaENHLE9BQU9qQixhQUFha0Isa0JBQWtCLENBQUNIO1lBRTdDLElBQUlFLFNBQVMsTUFBTTtnQkFDakIsSUFBTUUsV0FBV1QsV0FDWFUsT0FBT1IsS0FBS1MsWUFBWSxDQUFDRixVQUFVbkIsZUFDbkNzQix3QkFBd0JGLEtBQUtHLGVBQWUsQ0FBQ04sTUFBTWpCO2dCQUV6RCxJQUFJc0IsdUJBQXVCO29CQUN6QnJCLFVBQVU7Z0JBQ1o7WUFDRjtZQUVBLE9BQU9BO1FBQ1Q7SUFDRjtDQUNEO0FBR0gsSUFBTXVCLHNCQUFzQixJQUFJNUI7SUFFaEMsV0FBZTRCIn0=

package/lib/unifier/statementWithCombinator.js

@@ -11,6 +11,8 @@ Object.defineProperty(exports, "default", {
 var _shim = /*#__PURE__*/ _interop_require_default(require("../shim"));
 var _unifier = /*#__PURE__*/ _interop_require_default(require("../unifier"));
 var _query = require("../utilities/query");
+var _name = require("../utilities/name");
+var _local = /*#__PURE__*/ _interop_require_default(require("../context/local"));
 function _assert_this_initialized(self) {
     if (self === void 0) {
         throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
@@ -148,8 +150,8 @@ _define_property(StatementWithCombinatorUnifier, "maps", [
         nodeQueryB: typeNodeQuery,
         unify: function(termNodeA, typeNodeB, assignments, stated, localContext) {
             var unified = false;
-            var Term = _shim.default.Term, Type = _shim.default.Type, typeNode = typeNodeB, type = Type.fromTypeNode(typeNode, localContext), typeVerified = type.verify(localContext);
-            if (typeVerified) {
+            var Term = _shim.default.Term, typeNode = typeNodeB, typeName = (0, _name.typeNameFromTypeNode)(typeNode), type = localContext.findTypeByTypeName(typeName);
+            if (type !== null) {
                 var termNode = termNodeA, term = Term.fromTermNode(termNode, localContext), termVerifiedGivenType = term.verifyGivenType(type, localContext);
                 if (termVerifiedGivenType) {
                     unified = true;
@@ -162,4 +164,4 @@ _define_property(StatementWithCombinatorUnifier, "maps", [
 var statementWithCombinatorUnifier = new StatementWithCombinatorUnifier();
 var _default = statementWithCombinatorUnifier;
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91bmlmaWVyL3N0YXRlbWVudFdpdGhDb21iaW5hdG9yLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgc2hpbSBmcm9tIFwiLi4vc2hpbVwiO1xuaW1wb3J0IFVuaWZpZXIgZnJvbSBcIi4uL3VuaWZpZXJcIjtcblxuaW1wb3J0IHsgbm9kZVF1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5jb25zdCB0ZXJtTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3Rlcm0hXCIpLFxuICAgICAgdHlwZU5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi90eXBlIVwiKSxcbiAgICAgIGZyYW1lTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL2ZyYW1lIVwiKSxcbiAgICAgIG1ldGFUeXBlTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL21ldGFUeXBlIVwiKSxcbiAgICAgIHN0YXRlbWVudE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9zdGF0ZW1lbnQhXCIpO1xuXG5jbGFzcyBTdGF0ZW1lbnRXaXRoQ29tYmluYXRvclVuaWZpZXIgZXh0ZW5kcyBVbmlmaWVyIHtcbiAgdW5pZnkoc3RhdGVtZW50Tm9kZSwgY29tYmluYXRvclN0YXRlbWVudE5vZGUsIGFzc2lnbm1lbnRzLCBzdGF0ZWQsIGxvY2FsQ29udGV4dCkge1xuICAgIGxldCBzdGF0ZW1lbnRVbmlmaWVkV2l0aENvbWJpbmF0b3I7XG5cbiAgICBjb25zdCBub25UZXJtaW5hbE5vZGVBID0gc3RhdGVtZW50Tm9kZSwgLy8vXG4gICAgICAgICAgbm9uVGVybWluYWxOb2RlQiA9IGNvbWJpbmF0b3JTdGF0ZW1lbnROb2RlLCAvLy9cbiAgICAgICAgICBub25UZXJtaW5hbE5vZGVVbmlmaWVkID0gdGhpcy51bmlmeU5vblRlcm1pbmFsTm9kZShub25UZXJtaW5hbE5vZGVBLCBub25UZXJtaW5hbE5vZGVCLCBhc3NpZ25tZW50cywgc3RhdGVkLCBsb2NhbENvbnRleHQpO1xuXG4gICAgc3RhdGVtZW50VW5pZmllZFdpdGhDb21iaW5hdG9yID0gbm9uVGVybWluYWxOb2RlVW5pZmllZDsgLy8vXG5cbiAgICByZXR1cm4gc3RhdGVtZW50VW5pZmllZFdpdGhDb21iaW5hdG9yO1xuICB9O1xuXG4gIHN0YXRpYyBtYXBzID0gW1xuICAgIHtcbiAgICAgIG5vZGVRdWVyeUE6IHN0YXRlbWVudE5vZGVRdWVyeSxcbiAgICAgIG5vZGVRdWVyeUI6IG1ldGFUeXBlTm9kZVF1ZXJ5LFxuICAgICAgdW5pZnk6IChzdGF0ZW1lbnROb2RlQSwgbWV0YVR5cGVOb2RlQiwgYXNzaWdubWVudHMsIHN0YXRlZCwgbG9jYWxDb250ZXh0KSA9PiB7XG4gICAgICAgIGxldCB1bmlmaWVkO1xuXG4gICAgICAgIGNvbnN0IHsgU3RhdGVtZW50LCBNZXRhVHlwZSB9ID0gc2hpbSxcbiAgICAgICAgICAgICAgbWV0YVR5cGVOb2RlID0gbWV0YVR5cGVOb2RlQiwgLy8vXG4gICAgICAgICAgICAgIHN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnROb2RlQSwgLy8vXG4gICAgICAgICAgICAgIG1ldGFUeXBlID0gTWV0YVR5cGUuZnJvbU1ldGFUeXBlTm9kZShtZXRhVHlwZU5vZGUsIGxvY2FsQ29udGV4dCksXG4gICAgICAgICAgICAgIHN0YXRlbWVudCA9IFN0YXRlbWVudC5mcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlLCBsb2NhbENvbnRleHQpLFxuICAgICAgICAgICAgICBzdGF0ZW1lbnRWZXJpZmllZEdpdmVuVHlwZSA9IHN0YXRlbWVudC52ZXJpZnlHaXZlbk1ldGFUeXBlKG1ldGFUeXBlLCBhc3NpZ25tZW50cywgc3RhdGVkLCBsb2NhbENvbnRleHQpO1xuXG4gICAgICAgIHVuaWZpZWQgPSBzdGF0ZW1lbnRWZXJpZmllZEdpdmVuVHlwZTtcblxuICAgICAgICByZXR1cm4gdW5pZmllZDtcbiAgICAgIH1cbiAgICB9LFxuICAgIHtcbiAgICAgIG5vZGVRdWVyeUE6IGZyYW1lTm9kZVF1ZXJ5LFxuICAgICAgbm9kZVF1ZXJ5QjogbWV0YVR5cGVOb2RlUXVlcnksXG4gICAgICB1bmlmeTogKGZyYW1lTm9kZUEsIG1ldGFUeXBlTm9kZUIsIGFzc2lnbm1lbnRzLCBzdGF0ZWQsIGxvY2FsQ29udGV4dCkgPT4ge1xuICAgICAgICBsZXQgdW5pZmllZDtcblxuICAgICAgICBjb25zdCB7IEZyYW1lLCBNZXRhVHlwZSB9ID0gc2hpbSxcbiAgICAgICAgICAgICAgbWV0YVR5cGVOb2RlID0gbWV0YVR5cGVOb2RlQiwgLy8vXG4gICAgICAgICAgICAgIGZyYW1lTm9kZSA9IGZyYW1lTm9kZUEsIC8vL1xuICAgICAgICAgICAgICBtZXRhVHlwZSA9IE1ldGFUeXBlLmZyb21NZXRhVHlwZU5vZGUobWV0YVR5cGVOb2RlLCBsb2NhbENvbnRleHQpLFxuICAgICAgICAgICAgICBmcmFtZSA9IEZyYW1lLmZyb21UZXJtTm9kZShmcmFtZU5vZGUsIGxvY2FsQ29udGV4dCksXG4gICAgICAgICAgICAgIGZyYW1lVmVyaWZpZWRHaXZlblR5cGUgPSBmcmFtZS52ZXJpZnlHaXZlbk1ldGFUeXBlKG1ldGFUeXBlLCBsb2NhbENvbnRleHQpO1xuXG4gICAgICAgIHVuaWZpZWQgPSBmcmFtZVZlcmlmaWVkR2l2ZW5UeXBlO1xuXG4gICAgICAgIHJldHVybiB1bmlmaWVkO1xuICAgICAgfVxuICAgIH0sXG4gICAge1xuICAgICAgbm9kZVF1ZXJ5QTogdGVybU5vZGVRdWVyeSxcbiAgICAgIG5vZGVRdWVyeUI6IHR5cGVOb2RlUXVlcnksXG4gICAgICB1bmlmeTogKHRlcm1Ob2RlQSwgdHlwZU5vZGVCLCBhc3NpZ25tZW50cywgc3RhdGVkLCBsb2NhbENvbnRleHQpID0+IHtcbiAgICAgICAgbGV0IHVuaWZpZWQgPSBmYWxzZTtcblxuICAgICAgICBjb25zdCB7IFRlcm0sIFR5cGUgfSA9IHNoaW0sXG4gICAgICAgICAgICAgIHR5cGVOb2RlID0gdHlwZU5vZGVCLCAvLy9cbiAgICAgICAgICAgICAgdHlwZSA9IFR5cGUuZnJvbVR5cGVOb2RlKHR5cGVOb2RlLCBsb2NhbENvbnRleHQpLFxuICAgICAgICAgICAgICB0eXBlVmVyaWZpZWQgPSB0eXBlLnZlcmlmeShsb2NhbENvbnRleHQpO1xuXG4gICAgICAgIGlmICh0eXBlVmVyaWZpZWQpIHtcbiAgICAgICAgICBjb25zdCB0ZXJtTm9kZSA9IHRlcm1Ob2RlQSwgLy8vXG4gICAgICAgICAgICAgICAgdGVybSA9IFRlcm0uZnJvbVRlcm1Ob2RlKHRlcm1Ob2RlLCBsb2NhbENvbnRleHQpLFxuICAgICAgICAgICAgICAgIHRlcm1WZXJpZmllZEdpdmVuVHlwZSA9IHRlcm0udmVyaWZ5R2l2ZW5UeXBlKHR5cGUsIGxvY2FsQ29udGV4dCk7XG5cbiAgICAgICAgICBpZiAodGVybVZlcmlmaWVkR2l2ZW5UeXBlKSB7XG4gICAgICAgICAgICB1bmlmaWVkID0gdHJ1ZTtcbiAgICAgICAgICB9XG4gICAgICAgIH1cblxuICAgICAgICByZXR1cm4gdW5pZmllZDtcbiAgICAgIH1cbiAgICB9XG4gIF07XG59XG5cbmNvbnN0IHN0YXRlbWVudFdpdGhDb21iaW5hdG9yVW5pZmllciA9IG5ldyBTdGF0ZW1lbnRXaXRoQ29tYmluYXRvclVuaWZpZXIoKTtcblxuZXhwb3J0IGRlZmF1bHQgc3RhdGVtZW50V2l0aENvbWJpbmF0b3JVbmlmaWVyO1xuIl0sIm5hbWVzIjpbInRlcm1Ob2RlUXVlcnkiLCJub2RlUXVlcnkiLCJ0eXBlTm9kZVF1ZXJ5IiwiZnJhbWVOb2RlUXVlcnkiLCJtZXRhVHlwZU5vZGVRdWVyeSIsInN0YXRlbWVudE5vZGVRdWVyeSIsIlN0YXRlbWVudFdpdGhDb21iaW5hdG9yVW5pZmllciIsInVuaWZ5Iiwic3RhdGVtZW50Tm9kZSIsImNvbWJpbmF0b3JTdGF0ZW1lbnROb2RlIiwiYXNzaWdubWVudHMiLCJzdGF0ZWQiLCJsb2NhbENvbnRleHQiLCJzdGF0ZW1lbnRVbmlmaWVkV2l0aENvbWJpbmF0b3IiLCJub25UZXJtaW5hbE5vZGVBIiwibm9uVGVybWluYWxOb2RlQiIsIm5vblRlcm1pbmFsTm9kZVVuaWZpZWQiLCJ1bmlmeU5vblRlcm1pbmFsTm9kZSIsIlVuaWZpZXIiLCJtYXBzIiwibm9kZVF1ZXJ5QSIsIm5vZGVRdWVyeUIiLCJzdGF0ZW1lbnROb2RlQSIsIm1ldGFUeXBlTm9kZUIiLCJ1bmlmaWVkIiwiU3RhdGVtZW50Iiwic2hpbSIsIk1ldGFUeXBlIiwibWV0YVR5cGVOb2RlIiwibWV0YVR5cGUiLCJmcm9tTWV0YVR5cGVOb2RlIiwic3RhdGVtZW50IiwiZnJvbVN0YXRlbWVudE5vZGUiLCJzdGF0ZW1lbnRWZXJpZmllZEdpdmVuVHlwZSIsInZlcmlmeUdpdmVuTWV0YVR5cGUiLCJmcmFtZU5vZGVBIiwiRnJhbWUiLCJmcmFtZU5vZGUiLCJmcmFtZSIsImZyb21UZXJtTm9kZSIsImZyYW1lVmVyaWZpZWRHaXZlblR5cGUiLCJ0ZXJtTm9kZUEiLCJ0eXBlTm9kZUIiLCJUZXJtIiwiVHlwZSIsInR5cGVOb2RlIiwidHlwZSIsImZyb21UeXBlTm9kZSIsInR5cGVWZXJpZmllZCIsInZlcmlmeSIsInRlcm1Ob2RlIiwidGVybSIsInRlcm1WZXJpZmllZEdpdmVuVHlwZSIsInZlcmlmeUdpdmVuVHlwZSIsInN0YXRlbWVudFdpdGhDb21iaW5hdG9yVW5pZmllciJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBNEZBOzs7ZUFBQTs7OzJEQTFGaUI7OERBQ0c7cUJBRU07Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRTFCLElBQU1BLGdCQUFnQkMsSUFBQUEsZ0JBQVMsRUFBQyxXQUMxQkMsZ0JBQWdCRCxJQUFBQSxnQkFBUyxFQUFDLFdBQzFCRSxpQkFBaUJGLElBQUFBLGdCQUFTLEVBQUMsWUFDM0JHLG9CQUFvQkgsSUFBQUEsZ0JBQVMsRUFBQyxlQUM5QkkscUJBQXFCSixJQUFBQSxnQkFBUyxFQUFDO0FBRXJDLElBQUEsQUFBTUssK0NBQU47Y0FBTUE7YUFBQUE7Z0NBQUFBO2lDQUFBQTs7a0JBQUFBOztZQUNKQyxLQUFBQTttQkFBQUEsU0FBQUEsTUFBTUMsYUFBYSxFQUFFQyx1QkFBdUIsRUFBRUMsV0FBVyxFQUFFQyxNQUFNLEVBQUVDLFlBQVk7Z0JBQzdFLElBQUlDO2dCQUVKLElBQU1DLG1CQUFtQk4sZUFDbkJPLG1CQUFtQk4seUJBQ25CTyx5QkFBeUIsSUFBSSxDQUFDQyxvQkFBb0IsQ0FBQ0gsa0JBQWtCQyxrQkFBa0JMLGFBQWFDLFFBQVFDO2dCQUVsSEMsaUNBQWlDRyx3QkFBd0IsR0FBRztnQkFFNUQsT0FBT0g7WUFDVDs7O1dBWElQO0VBQXVDWSxnQkFBTztBQWFsRCxpQkFiSVosZ0NBYUdhLFFBQU87SUFDWjtRQUNFQyxZQUFZZjtRQUNaZ0IsWUFBWWpCO1FBQ1pHLE9BQU8sU0FBQ2UsZ0JBQWdCQyxlQUFlYixhQUFhQyxRQUFRQztZQUMxRCxJQUFJWTtZQUVKLElBQVFDLFlBQXdCQyxhQUFJLENBQTVCRCxXQUFXRSxXQUFhRCxhQUFJLENBQWpCQyxVQUNiQyxlQUFlTCxlQUNmZixnQkFBZ0JjLGdCQUNoQk8sV0FBV0YsU0FBU0csZ0JBQWdCLENBQUNGLGNBQWNoQixlQUNuRG1CLFlBQVlOLFVBQVVPLGlCQUFpQixDQUFDeEIsZUFBZUksZUFDdkRxQiw2QkFBNkJGLFVBQVVHLG1CQUFtQixDQUFDTCxVQUFVbkIsYUFBYUMsUUFBUUM7WUFFaEdZLFVBQVVTO1lBRVYsT0FBT1Q7UUFDVDtJQUNGO0lBQ0E7UUFDRUosWUFBWWpCO1FBQ1prQixZQUFZakI7UUFDWkcsT0FBTyxTQUFDNEIsWUFBWVosZUFBZWIsYUFBYUMsUUFBUUM7WUFDdEQsSUFBSVk7WUFFSixJQUFRWSxRQUFvQlYsYUFBSSxDQUF4QlUsT0FBT1QsV0FBYUQsYUFBSSxDQUFqQkMsVUFDVEMsZUFBZUwsZUFDZmMsWUFBWUYsWUFDWk4sV0FBV0YsU0FBU0csZ0JBQWdCLENBQUNGLGNBQWNoQixlQUNuRDBCLFFBQVFGLE1BQU1HLFlBQVksQ0FBQ0YsV0FBV3pCLGVBQ3RDNEIseUJBQXlCRixNQUFNSixtQkFBbUIsQ0FBQ0wsVUFBVWpCO1lBRW5FWSxVQUFVZ0I7WUFFVixPQUFPaEI7UUFDVDtJQUNGO0lBQ0E7UUFDRUosWUFBWXBCO1FBQ1pxQixZQUFZbkI7UUFDWkssT0FBTyxTQUFDa0MsV0FBV0MsV0FBV2hDLGFBQWFDLFFBQVFDO1lBQ2pELElBQUlZLFVBQVU7WUFFZCxJQUFRbUIsT0FBZWpCLGFBQUksQ0FBbkJpQixNQUFNQyxPQUFTbEIsYUFBSSxDQUFia0IsTUFDUkMsV0FBV0gsV0FDWEksT0FBT0YsS0FBS0csWUFBWSxDQUFDRixVQUFVakMsZUFDbkNvQyxlQUFlRixLQUFLRyxNQUFNLENBQUNyQztZQUVqQyxJQUFJb0MsY0FBYztnQkFDaEIsSUFBTUUsV0FBV1QsV0FDWFUsT0FBT1IsS0FBS0osWUFBWSxDQUFDVyxVQUFVdEMsZUFDbkN3Qyx3QkFBd0JELEtBQUtFLGVBQWUsQ0FBQ1AsTUFBTWxDO2dCQUV6RCxJQUFJd0MsdUJBQXVCO29CQUN6QjVCLFVBQVU7Z0JBQ1o7WUFDRjtZQUVBLE9BQU9BO1FBQ1Q7SUFDRjtDQUNEO0FBR0gsSUFBTThCLGlDQUFpQyxJQUFJaEQ7SUFFM0MsV0FBZWdEIn0=
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/unifier/statementWithCombinator.js"],"sourcesContent":["\"use strict\";\n\nimport shim from \"../shim\";\nimport Unifier from \"../unifier\";\n\nimport { nodeQuery } from \"../utilities/query\";\nimport { typeNameFromTypeNode } from \"../utilities/name\";\nimport local from \"../context/local\";\n\nconst termNodeQuery = nodeQuery(\"/term!\"),\n      typeNodeQuery = nodeQuery(\"/type!\"),\n      frameNodeQuery = nodeQuery(\"/frame!\"),\n      metaTypeNodeQuery = nodeQuery(\"/metaType!\"),\n      statementNodeQuery = nodeQuery(\"/statement!\");\n\nclass StatementWithCombinatorUnifier extends Unifier {\n  unify(statementNode, combinatorStatementNode, assignments, stated, localContext) {\n    let statementUnifiedWithCombinator;\n\n    const nonTerminalNodeA = statementNode, ///\n          nonTerminalNodeB = combinatorStatementNode, ///\n          nonTerminalNodeUnified = this.unifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, assignments, stated, localContext);\n\n    statementUnifiedWithCombinator = nonTerminalNodeUnified; ///\n\n    return statementUnifiedWithCombinator;\n  };\n\n  static maps = [\n    {\n      nodeQueryA: statementNodeQuery,\n      nodeQueryB: metaTypeNodeQuery,\n      unify: (statementNodeA, metaTypeNodeB, assignments, stated, localContext) => {\n        let unified;\n\n        const { Statement, MetaType } = shim,\n              metaTypeNode = metaTypeNodeB, ///\n              statementNode = statementNodeA, ///\n              metaType = MetaType.fromMetaTypeNode(metaTypeNode, localContext),\n              statement = Statement.fromStatementNode(statementNode, localContext),\n              statementVerifiedGivenType = statement.verifyGivenMetaType(metaType, assignments, stated, localContext);\n\n        unified = statementVerifiedGivenType;\n\n        return unified;\n      }\n    },\n    {\n      nodeQueryA: frameNodeQuery,\n      nodeQueryB: metaTypeNodeQuery,\n      unify: (frameNodeA, metaTypeNodeB, assignments, stated, localContext) => {\n        let unified;\n\n        const { Frame, MetaType } = shim,\n              metaTypeNode = metaTypeNodeB, ///\n              frameNode = frameNodeA, ///\n              metaType = MetaType.fromMetaTypeNode(metaTypeNode, localContext),\n              frame = Frame.fromTermNode(frameNode, localContext),\n              frameVerifiedGivenType = frame.verifyGivenMetaType(metaType, localContext);\n\n        unified = frameVerifiedGivenType;\n\n        return unified;\n      }\n    },\n    {\n      nodeQueryA: termNodeQuery,\n      nodeQueryB: typeNodeQuery,\n      unify: (termNodeA, typeNodeB, assignments, stated, localContext) => {\n        let unified = false;\n\n        const { Term } = shim,\n              typeNode = typeNodeB, ///\n              typeName = typeNameFromTypeNode(typeNode),\n              type = localContext.findTypeByTypeName(typeName);\n\n        if (type !== null) {\n          const termNode = termNodeA, ///\n                term = Term.fromTermNode(termNode, localContext),\n                termVerifiedGivenType = term.verifyGivenType(type, localContext);\n\n          if (termVerifiedGivenType) {\n            unified = true;\n          }\n        }\n\n        return unified;\n      }\n    }\n  ];\n}\n\nconst statementWithCombinatorUnifier = new StatementWithCombinatorUnifier();\n\nexport default statementWithCombinatorUnifier;\n"],"names":["termNodeQuery","nodeQuery","typeNodeQuery","frameNodeQuery","metaTypeNodeQuery","statementNodeQuery","StatementWithCombinatorUnifier","unify","statementNode","combinatorStatementNode","assignments","stated","localContext","statementUnifiedWithCombinator","nonTerminalNodeA","nonTerminalNodeB","nonTerminalNodeUnified","unifyNonTerminalNode","Unifier","maps","nodeQueryA","nodeQueryB","statementNodeA","metaTypeNodeB","unified","Statement","shim","MetaType","metaTypeNode","metaType","fromMetaTypeNode","statement","fromStatementNode","statementVerifiedGivenType","verifyGivenMetaType","frameNodeA","Frame","frameNode","frame","fromTermNode","frameVerifiedGivenType","termNodeA","typeNodeB","Term","typeNode","typeName","typeNameFromTypeNode","type","findTypeByTypeName","termNode","term","termVerifiedGivenType","verifyGivenType","statementWithCombinatorUnifier"],"mappings":"AAAA;;;;+BA8FA;;;eAAA;;;2DA5FiB;8DACG;qBAEM;oBACW;4DACnB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAElB,IAAMA,gBAAgBC,IAAAA,gBAAS,EAAC,WAC1BC,gBAAgBD,IAAAA,gBAAS,EAAC,WAC1BE,iBAAiBF,IAAAA,gBAAS,EAAC,YAC3BG,oBAAoBH,IAAAA,gBAAS,EAAC,eAC9BI,qBAAqBJ,IAAAA,gBAAS,EAAC;AAErC,IAAA,AAAMK,+CAAN;cAAMA;aAAAA;gCAAAA;iCAAAA;;kBAAAA;;YACJC,KAAAA;mBAAAA,SAAAA,MAAMC,aAAa,EAAEC,uBAAuB,EAAEC,WAAW,EAAEC,MAAM,EAAEC,YAAY;gBAC7E,IAAIC;gBAEJ,IAAMC,mBAAmBN,eACnBO,mBAAmBN,yBACnBO,yBAAyB,IAAI,CAACC,oBAAoB,CAACH,kBAAkBC,kBAAkBL,aAAaC,QAAQC;gBAElHC,iCAAiCG,wBAAwB,GAAG;gBAE5D,OAAOH;YACT;;;WAXIP;EAAuCY,gBAAO;AAalD,iBAbIZ,gCAaGa,QAAO;IACZ;QACEC,YAAYf;QACZgB,YAAYjB;QACZG,OAAO,SAACe,gBAAgBC,eAAeb,aAAaC,QAAQC;YAC1D,IAAIY;YAEJ,IAAQC,YAAwBC,aAAI,CAA5BD,WAAWE,WAAaD,aAAI,CAAjBC,UACbC,eAAeL,eACff,gBAAgBc,gBAChBO,WAAWF,SAASG,gBAAgB,CAACF,cAAchB,eACnDmB,YAAYN,UAAUO,iBAAiB,CAACxB,eAAeI,eACvDqB,6BAA6BF,UAAUG,mBAAmB,CAACL,UAAUnB,aAAaC,QAAQC;YAEhGY,UAAUS;YAEV,OAAOT;QACT;IACF;IACA;QACEJ,YAAYjB;QACZkB,YAAYjB;QACZG,OAAO,SAAC4B,YAAYZ,eAAeb,aAAaC,QAAQC;YACtD,IAAIY;YAEJ,IAAQY,QAAoBV,aAAI,CAAxBU,OAAOT,WAAaD,aAAI,CAAjBC,UACTC,eAAeL,eACfc,YAAYF,YACZN,WAAWF,SAASG,gBAAgB,CAACF,cAAchB,eACnD0B,QAAQF,MAAMG,YAAY,CAACF,WAAWzB,eACtC4B,yBAAyBF,MAAMJ,mBAAmB,CAACL,UAAUjB;YAEnEY,UAAUgB;YAEV,OAAOhB;QACT;IACF;IACA;QACEJ,YAAYpB;QACZqB,YAAYnB;QACZK,OAAO,SAACkC,WAAWC,WAAWhC,aAAaC,QAAQC;YACjD,IAAIY,UAAU;YAEd,IAAM,AAAEmB,OAASjB,aAAI,CAAbiB,MACFC,WAAWF,WACXG,WAAWC,IAAAA,0BAAoB,EAACF,WAChCG,OAAOnC,aAAaoC,kBAAkB,CAACH;YAE7C,IAAIE,SAAS,MAAM;gBACjB,IAAME,WAAWR,WACXS,OAAOP,KAAKJ,YAAY,CAACU,UAAUrC,eACnCuC,wBAAwBD,KAAKE,eAAe,CAACL,MAAMnC;gBAEzD,IAAIuC,uBAAuB;oBACzB3B,UAAU;gBACZ;YACF;YAEA,OAAOA;QACT;IACF;CACD;AAGH,IAAM6B,iCAAiC,IAAI/C;IAE3C,WAAe+C"}

package/lib/unifier/termWithConstructor.js

@@ -11,6 +11,7 @@ Object.defineProperty(exports, "default", {
 var _shim = /*#__PURE__*/ _interop_require_default(require("../shim"));
 var _unifier = /*#__PURE__*/ _interop_require_default(require("../unifier"));
 var _query = require("../utilities/query");
+var _name = require("../utilities/name");
 function _assert_this_initialized(self) {
     if (self === void 0) {
         throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
@@ -128,8 +129,8 @@ _define_property(TermWithConstructorUnifier, "maps", [
         nodeQueryB: typeNodeQuery,
         unify: function(termNodeA, typeNodeB, localContext) {
             var unified = false;
-            var Term = _shim.default.Term, Type = _shim.default.Type, typeNode = typeNodeB, type = Type.fromTypeNode(typeNode, localContext), typeVerified = type.verify(localContext);
-            if (typeVerified) {
+            var Term = _shim.default.Term, typeNode = typeNodeB, typeName = (0, _name.typeNameFromTypeNode)(typeNode), type = localContext.findTypeByTypeName(typeName);
+            if (type !== null) {
                 var termNode = termNodeA, term = Term.fromTermNode(termNode, localContext), termVerifiedGivenType = term.verifyGivenType(type, localContext);
                 if (termVerifiedGivenType) {
                     unified = true;
@@ -142,4 +143,4 @@ _define_property(TermWithConstructorUnifier, "maps", [
 var termWithConstructorUnifier = new TermWithConstructorUnifier();
 var _default = termWithConstructorUnifier;
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91bmlmaWVyL3Rlcm1XaXRoQ29uc3RydWN0b3IuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBzaGltIGZyb20gXCIuLi9zaGltXCI7XG5pbXBvcnQgVW5pZmllciBmcm9tIFwiLi4vdW5pZmllclwiO1xuXG5pbXBvcnQgeyBub2RlUXVlcnkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5cbmNvbnN0IHRlcm1Ob2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvdGVybVwiKSxcbiAgICAgIHR5cGVOb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvdHlwZVwiKTtcblxuY2xhc3MgVGVybVdpdGhDb25zdHJ1Y3RvclVuaWZpZXIgZXh0ZW5kcyBVbmlmaWVyIHtcbiAgdW5pZnkodGVybU5vZGUsIGNvbnN0cnVjdG9yVGVybU5vZGUsIGxvY2FsQ29udGV4dCkge1xuICAgIGxldCB0ZXJtVW5pZmllZFdpdGhDb25zdHJ1Y3RvcjtcblxuICAgIGNvbnN0IG5vblRlcm1pbmFsTm9kZUEgPSB0ZXJtTm9kZSwgLy8vXG4gICAgICAgICAgbm9uVGVybWluYWxOb2RlQiA9IGNvbnN0cnVjdG9yVGVybU5vZGUsIC8vL1xuICAgICAgICAgIG5vblRlcm1pbmFsTm9kZVVuaWZpZWQgPSB0aGlzLnVuaWZ5Tm9uVGVybWluYWxOb2RlKG5vblRlcm1pbmFsTm9kZUEsIG5vblRlcm1pbmFsTm9kZUIsIGxvY2FsQ29udGV4dCk7XG5cbiAgICB0ZXJtVW5pZmllZFdpdGhDb25zdHJ1Y3RvciA9IG5vblRlcm1pbmFsTm9kZVVuaWZpZWQ7IC8vL1xuXG4gICAgcmV0dXJuIHRlcm1VbmlmaWVkV2l0aENvbnN0cnVjdG9yO1xuICB9O1xuXG4gIHN0YXRpYyBtYXBzID0gW1xuICAgIHtcbiAgICAgIG5vZGVRdWVyeUE6IHRlcm1Ob2RlUXVlcnksXG4gICAgICBub2RlUXVlcnlCOiB0eXBlTm9kZVF1ZXJ5LFxuICAgICAgdW5pZnk6ICh0ZXJtTm9kZUEsIHR5cGVOb2RlQiwgbG9jYWxDb250ZXh0KSA9PiB7XG4gICAgICAgIGxldCB1bmlmaWVkID0gZmFsc2U7XG5cbiAgICAgICAgY29uc3QgeyBUZXJtLCBUeXBlIH0gPSBzaGltLFxuICAgICAgICAgICAgICB0eXBlTm9kZSA9IHR5cGVOb2RlQiwgLy8vXG4gICAgICAgICAgICAgIHR5cGUgPSBUeXBlLmZyb21UeXBlTm9kZSh0eXBlTm9kZSwgbG9jYWxDb250ZXh0KSxcbiAgICAgICAgICAgICAgdHlwZVZlcmlmaWVkID0gdHlwZS52ZXJpZnkobG9jYWxDb250ZXh0KTtcblxuICAgICAgICBpZiAodHlwZVZlcmlmaWVkKSB7XG4gICAgICAgICAgY29uc3QgdGVybU5vZGUgPSB0ZXJtTm9kZUEsIC8vL1xuICAgICAgICAgICAgICAgIHRlcm0gPSBUZXJtLmZyb21UZXJtTm9kZSh0ZXJtTm9kZSwgbG9jYWxDb250ZXh0KSxcbiAgICAgICAgICAgICAgICB0ZXJtVmVyaWZpZWRHaXZlblR5cGUgPSB0ZXJtLnZlcmlmeUdpdmVuVHlwZSh0eXBlLCBsb2NhbENvbnRleHQpO1xuXG4gICAgICAgICAgaWYgKHRlcm1WZXJpZmllZEdpdmVuVHlwZSkge1xuICAgICAgICAgICAgdW5pZmllZCA9IHRydWU7XG4gICAgICAgICAgfVxuICAgICAgICB9XG5cbiAgICAgICAgcmV0dXJuIHVuaWZpZWQ7XG4gICAgICB9XG4gICAgfVxuICBdO1xufVxuXG5jb25zdCB0ZXJtV2l0aENvbnN0cnVjdG9yVW5pZmllciA9IG5ldyBUZXJtV2l0aENvbnN0cnVjdG9yVW5pZmllcigpO1xuXG5leHBvcnQgZGVmYXVsdCB0ZXJtV2l0aENvbnN0cnVjdG9yVW5pZmllcjtcbiJdLCJuYW1lcyI6WyJ0ZXJtTm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5IiwidHlwZU5vZGVRdWVyeSIsIlRlcm1XaXRoQ29uc3RydWN0b3JVbmlmaWVyIiwidW5pZnkiLCJ0ZXJtTm9kZSIsImNvbnN0cnVjdG9yVGVybU5vZGUiLCJsb2NhbENvbnRleHQiLCJ0ZXJtVW5pZmllZFdpdGhDb25zdHJ1Y3RvciIsIm5vblRlcm1pbmFsTm9kZUEiLCJub25UZXJtaW5hbE5vZGVCIiwibm9uVGVybWluYWxOb2RlVW5pZmllZCIsInVuaWZ5Tm9uVGVybWluYWxOb2RlIiwiVW5pZmllciIsIm1hcHMiLCJub2RlUXVlcnlBIiwibm9kZVF1ZXJ5QiIsInRlcm1Ob2RlQSIsInR5cGVOb2RlQiIsInVuaWZpZWQiLCJUZXJtIiwic2hpbSIsIlR5cGUiLCJ0eXBlTm9kZSIsInR5cGUiLCJmcm9tVHlwZU5vZGUiLCJ0eXBlVmVyaWZpZWQiLCJ2ZXJpZnkiLCJ0ZXJtIiwiZnJvbVRlcm1Ob2RlIiwidGVybVZlcmlmaWVkR2l2ZW5UeXBlIiwidmVyaWZ5R2l2ZW5UeXBlIiwidGVybVdpdGhDb25zdHJ1Y3RvclVuaWZpZXIiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQXFEQTs7O2VBQUE7OzsyREFuRGlCOzhEQUNHO3FCQUVNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUUxQixJQUFNQSxnQkFBZ0JDLElBQUFBLGdCQUFTLEVBQUMsVUFDMUJDLGdCQUFnQkQsSUFBQUEsZ0JBQVMsRUFBQztBQUVoQyxJQUFBLEFBQU1FLDJDQUFOO2NBQU1BO2FBQUFBO2dDQUFBQTtpQ0FBQUE7O2tCQUFBQTs7WUFDSkMsS0FBQUE7bUJBQUFBLFNBQUFBLE1BQU1DLFFBQVEsRUFBRUMsbUJBQW1CLEVBQUVDLFlBQVk7Z0JBQy9DLElBQUlDO2dCQUVKLElBQU1DLG1CQUFtQkosVUFDbkJLLG1CQUFtQkoscUJBQ25CSyx5QkFBeUIsSUFBSSxDQUFDQyxvQkFBb0IsQ0FBQ0gsa0JBQWtCQyxrQkFBa0JIO2dCQUU3RkMsNkJBQTZCRyx3QkFBd0IsR0FBRztnQkFFeEQsT0FBT0g7WUFDVDs7O1dBWElMO0VBQW1DVSxnQkFBTztBQWE5QyxpQkFiSVYsNEJBYUdXLFFBQU87SUFDWjtRQUNFQyxZQUFZZjtRQUNaZ0IsWUFBWWQ7UUFDWkUsT0FBTyxTQUFDYSxXQUFXQyxXQUFXWDtZQUM1QixJQUFJWSxVQUFVO1lBRWQsSUFBUUMsT0FBZUMsYUFBSSxDQUFuQkQsTUFBTUUsT0FBU0QsYUFBSSxDQUFiQyxNQUNSQyxXQUFXTCxXQUNYTSxPQUFPRixLQUFLRyxZQUFZLENBQUNGLFVBQVVoQixlQUNuQ21CLGVBQWVGLEtBQUtHLE1BQU0sQ0FBQ3BCO1lBRWpDLElBQUltQixjQUFjO2dCQUNoQixJQUFNckIsV0FBV1ksV0FDWFcsT0FBT1IsS0FBS1MsWUFBWSxDQUFDeEIsVUFBVUUsZUFDbkN1Qix3QkFBd0JGLEtBQUtHLGVBQWUsQ0FBQ1AsTUFBTWpCO2dCQUV6RCxJQUFJdUIsdUJBQXVCO29CQUN6QlgsVUFBVTtnQkFDWjtZQUNGO1lBRUEsT0FBT0E7UUFDVDtJQUNGO0NBQ0Q7QUFHSCxJQUFNYSw2QkFBNkIsSUFBSTdCO0lBRXZDLFdBQWU2QiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91bmlmaWVyL3Rlcm1XaXRoQ29uc3RydWN0b3IuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBzaGltIGZyb20gXCIuLi9zaGltXCI7XG5pbXBvcnQgVW5pZmllciBmcm9tIFwiLi4vdW5pZmllclwiO1xuXG5pbXBvcnQgeyBub2RlUXVlcnkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5pbXBvcnQgeyB0eXBlTmFtZUZyb21UeXBlTm9kZSB9IGZyb20gXCIuLi91dGlsaXRpZXMvbmFtZVwiO1xuXG5jb25zdCB0ZXJtTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3Rlcm1cIiksXG4gICAgICB0eXBlTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3R5cGVcIik7XG5cbmNsYXNzIFRlcm1XaXRoQ29uc3RydWN0b3JVbmlmaWVyIGV4dGVuZHMgVW5pZmllciB7XG4gIHVuaWZ5KHRlcm1Ob2RlLCBjb25zdHJ1Y3RvclRlcm1Ob2RlLCBsb2NhbENvbnRleHQpIHtcbiAgICBsZXQgdGVybVVuaWZpZWRXaXRoQ29uc3RydWN0b3I7XG5cbiAgICBjb25zdCBub25UZXJtaW5hbE5vZGVBID0gdGVybU5vZGUsIC8vL1xuICAgICAgICAgIG5vblRlcm1pbmFsTm9kZUIgPSBjb25zdHJ1Y3RvclRlcm1Ob2RlLCAvLy9cbiAgICAgICAgICBub25UZXJtaW5hbE5vZGVVbmlmaWVkID0gdGhpcy51bmlmeU5vblRlcm1pbmFsTm9kZShub25UZXJtaW5hbE5vZGVBLCBub25UZXJtaW5hbE5vZGVCLCBsb2NhbENvbnRleHQpO1xuXG4gICAgdGVybVVuaWZpZWRXaXRoQ29uc3RydWN0b3IgPSBub25UZXJtaW5hbE5vZGVVbmlmaWVkOyAvLy9cblxuICAgIHJldHVybiB0ZXJtVW5pZmllZFdpdGhDb25zdHJ1Y3RvcjtcbiAgfTtcblxuICBzdGF0aWMgbWFwcyA9IFtcbiAgICB7XG4gICAgICBub2RlUXVlcnlBOiB0ZXJtTm9kZVF1ZXJ5LFxuICAgICAgbm9kZVF1ZXJ5QjogdHlwZU5vZGVRdWVyeSxcbiAgICAgIHVuaWZ5OiAodGVybU5vZGVBLCB0eXBlTm9kZUIsIGxvY2FsQ29udGV4dCkgPT4ge1xuICAgICAgICBsZXQgdW5pZmllZCA9IGZhbHNlO1xuXG4gICAgICAgIGNvbnN0IHsgVGVybSB9ID0gc2hpbSxcbiAgICAgICAgICAgICAgdHlwZU5vZGUgPSB0eXBlTm9kZUIsIC8vL1xuICAgICAgICAgICAgICB0eXBlTmFtZSA9IHR5cGVOYW1lRnJvbVR5cGVOb2RlKHR5cGVOb2RlKSxcbiAgICAgICAgICAgICAgdHlwZSA9IGxvY2FsQ29udGV4dC5maW5kVHlwZUJ5VHlwZU5hbWUodHlwZU5hbWUpO1xuXG4gICAgICAgIGlmICh0eXBlICE9PSBudWxsKSB7XG4gICAgICAgICAgY29uc3QgdGVybU5vZGUgPSB0ZXJtTm9kZUEsIC8vL1xuICAgICAgICAgICAgICAgIHRlcm0gPSBUZXJtLmZyb21UZXJtTm9kZSh0ZXJtTm9kZSwgbG9jYWxDb250ZXh0KSxcbiAgICAgICAgICAgICAgICB0ZXJtVmVyaWZpZWRHaXZlblR5cGUgPSB0ZXJtLnZlcmlmeUdpdmVuVHlwZSh0eXBlLCBsb2NhbENvbnRleHQpO1xuXG4gICAgICAgICAgaWYgKHRlcm1WZXJpZmllZEdpdmVuVHlwZSkge1xuICAgICAgICAgICAgdW5pZmllZCA9IHRydWU7XG4gICAgICAgICAgfVxuICAgICAgICB9XG5cbiAgICAgICAgcmV0dXJuIHVuaWZpZWQ7XG4gICAgICB9XG4gICAgfVxuICBdO1xufVxuXG5jb25zdCB0ZXJtV2l0aENvbnN0cnVjdG9yVW5pZmllciA9IG5ldyBUZXJtV2l0aENvbnN0cnVjdG9yVW5pZmllcigpO1xuXG5leHBvcnQgZGVmYXVsdCB0ZXJtV2l0aENvbnN0cnVjdG9yVW5pZmllcjtcbiJdLCJuYW1lcyI6WyJ0ZXJtTm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5IiwidHlwZU5vZGVRdWVyeSIsIlRlcm1XaXRoQ29uc3RydWN0b3JVbmlmaWVyIiwidW5pZnkiLCJ0ZXJtTm9kZSIsImNvbnN0cnVjdG9yVGVybU5vZGUiLCJsb2NhbENvbnRleHQiLCJ0ZXJtVW5pZmllZFdpdGhDb25zdHJ1Y3RvciIsIm5vblRlcm1pbmFsTm9kZUEiLCJub25UZXJtaW5hbE5vZGVCIiwibm9uVGVybWluYWxOb2RlVW5pZmllZCIsInVuaWZ5Tm9uVGVybWluYWxOb2RlIiwiVW5pZmllciIsIm1hcHMiLCJub2RlUXVlcnlBIiwibm9kZVF1ZXJ5QiIsInRlcm1Ob2RlQSIsInR5cGVOb2RlQiIsInVuaWZpZWQiLCJUZXJtIiwic2hpbSIsInR5cGVOb2RlIiwidHlwZU5hbWUiLCJ0eXBlTmFtZUZyb21UeXBlTm9kZSIsInR5cGUiLCJmaW5kVHlwZUJ5VHlwZU5hbWUiLCJ0ZXJtIiwiZnJvbVRlcm1Ob2RlIiwidGVybVZlcmlmaWVkR2l2ZW5UeXBlIiwidmVyaWZ5R2l2ZW5UeXBlIiwidGVybVdpdGhDb25zdHJ1Y3RvclVuaWZpZXIiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQXNEQTs7O2VBQUE7OzsyREFwRGlCOzhEQUNHO3FCQUVNO29CQUNXOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVyQyxJQUFNQSxnQkFBZ0JDLElBQUFBLGdCQUFTLEVBQUMsVUFDMUJDLGdCQUFnQkQsSUFBQUEsZ0JBQVMsRUFBQztBQUVoQyxJQUFBLEFBQU1FLDJDQUFOO2NBQU1BO2FBQUFBO2dDQUFBQTtpQ0FBQUE7O2tCQUFBQTs7WUFDSkMsS0FBQUE7bUJBQUFBLFNBQUFBLE1BQU1DLFFBQVEsRUFBRUMsbUJBQW1CLEVBQUVDLFlBQVk7Z0JBQy9DLElBQUlDO2dCQUVKLElBQU1DLG1CQUFtQkosVUFDbkJLLG1CQUFtQkoscUJBQ25CSyx5QkFBeUIsSUFBSSxDQUFDQyxvQkFBb0IsQ0FBQ0gsa0JBQWtCQyxrQkFBa0JIO2dCQUU3RkMsNkJBQTZCRyx3QkFBd0IsR0FBRztnQkFFeEQsT0FBT0g7WUFDVDs7O1dBWElMO0VBQW1DVSxnQkFBTztBQWE5QyxpQkFiSVYsNEJBYUdXLFFBQU87SUFDWjtRQUNFQyxZQUFZZjtRQUNaZ0IsWUFBWWQ7UUFDWkUsT0FBTyxTQUFDYSxXQUFXQyxXQUFXWDtZQUM1QixJQUFJWSxVQUFVO1lBRWQsSUFBTSxBQUFFQyxPQUFTQyxhQUFJLENBQWJELE1BQ0ZFLFdBQVdKLFdBQ1hLLFdBQVdDLElBQUFBLDBCQUFvQixFQUFDRixXQUNoQ0csT0FBT2xCLGFBQWFtQixrQkFBa0IsQ0FBQ0g7WUFFN0MsSUFBSUUsU0FBUyxNQUFNO2dCQUNqQixJQUFNcEIsV0FBV1ksV0FDWFUsT0FBT1AsS0FBS1EsWUFBWSxDQUFDdkIsVUFBVUUsZUFDbkNzQix3QkFBd0JGLEtBQUtHLGVBQWUsQ0FBQ0wsTUFBTWxCO2dCQUV6RCxJQUFJc0IsdUJBQXVCO29CQUN6QlYsVUFBVTtnQkFDWjtZQUNGO1lBRUEsT0FBT0E7UUFDVDtJQUNGO0NBQ0Q7QUFHSCxJQUFNWSw2QkFBNkIsSUFBSTVCO0lBRXZDLFdBQWU0QiJ9

package/lib/variable.js

@@ -106,20 +106,40 @@ var Variable = /*#__PURE__*/ function() {
                 return verified;
             }
         },
+        {
+            key: "verifyType",
+            value: function verifyType(fileContext) {
+                var typeVerified;
+                var typeName = this.type.getName();
+                fileContext.trace("Verifying the '".concat(typeName, "' type..."));
+                var type = fileContext.findTypeByTypeName(typeName);
+                if (type === null) {
+                    fileContext.debug("The '".concat(typeName, "' type is missing."));
+                } else {
+                    this.type = type; ///
+                    typeVerified = true;
+                }
+                if (typeVerified) {
+                    fileContext.debug("...verified the '".concat(typeName, "' type."));
+                }
+                return typeVerified;
+            }
+        },
         {
             key: "verifyAtTopLevel",
-            value: function verifyAtTopLevel(localContext) {
+            value: function verifyAtTopLevel(fileContext) {
                 var verifiedAtTopLevel;
                 var variableString = this.string; ///
-                localContext.trace("Verifying the '".concat(variableString, "' variable at top level..."));
-                var variableNode = this.node, variableName = (0, _name.variableNameFromVariableNode)(variableNode), variablePresent = localContext.isVariablePresentByVariableName(variableName);
+                fileContext.trace("Verifying the '".concat(variableString, "' variable at top level..."));
+                var variableNode = this.node, variableName = (0, _name.variableNameFromVariableNode)(variableNode), variablePresent = fileContext.isVariablePresentByVariableName(variableName);
                 if (variablePresent) {
-                    localContext.debug("The '".concat(variableString, "' variable is already present."));
+                    fileContext.debug("The '".concat(variableString, "' variable is already present."));
                 } else {
-                    verifiedAtTopLevel = true;
+                    var typeVerified = this.verifyType(fileContext);
+                    verifiedAtTopLevel = typeVerified; ///
                 }
                 if (verifiedAtTopLevel) {
-                    localContext.debug("...verified the '".concat(variableString, "' variable at top level."));
+                    fileContext.debug("...verified the '".concat(variableString, "' variable at top level."));
                 }
                 return verifiedAtTopLevel;
             }
@@ -127,7 +147,7 @@ var Variable = /*#__PURE__*/ function() {
         {
             key: "toJSON",
             value: function toJSON() {
-                var typeJSON = this.type !== null ? this.type.toJSON() : null, string = this.string, type = typeJSON, json = {
+                var typeJSON = this.type.toJSON(), string = this.string, type = typeJSON, json = {
                     string: string,
                     type: type
                 };
@@ -159,7 +179,7 @@ var Variable = /*#__PURE__*/ function() {
         {
             key: "fromVariableDeclarationNode",
             value: function fromVariableDeclarationNode(variableDeclarationNode, fileContext) {
-                var Type = _shim.default.Type, typeNode = typeNodeQuery(variableDeclarationNode), variableNode = variableNodeQuery(variableDeclarationNode), variableName = (0, _name.variableNameFromVariableNode)(variableNode), localContext = _local.default.fromFileContext(fileContext), variableString = fileContext.nodeAsString(variableNode), string = variableString, node = variableNode, name = variableName, type = typeNode === null ? _type.objectType : Type.fromTypeNode(typeNode, localContext), variable = new Variable(string, node, name, type);
+                var Type = _shim.default.Type, typeNode = typeNodeQuery(variableDeclarationNode), variableNode = variableNodeQuery(variableDeclarationNode), variableName = (0, _name.variableNameFromVariableNode)(variableNode), localContext = _local.default.fromFileContext(fileContext), variableString = fileContext.nodeAsString(variableNode), string = variableString, node = variableNode, name = variableName, type = Type.fromTypeNode(typeNode, localContext), variable = new Variable(string, node, name, type);
                 return variable;
             }
         }
@@ -173,4 +193,4 @@ function typeFromJSON(json, fileContext) {
     return type;
 }
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/variable.js"],"sourcesContent":["\"use strict\";\n\nimport shim from \"./shim\";\nimport LocalContext from \"./context/local\";\n\nimport { nodeQuery } from \"./utilities/query\";\nimport { objectType } from \"./type\";\nimport { variableNameFromVariableNode} from \"./utilities/name\";\nimport { variableNodeFromVariableString } from \"./utilities/node\";\n\nconst typeNodeQuery = nodeQuery(\"/variableDeclaration/type\"),\n      variableNodeQuery = nodeQuery(\"/variableDeclaration/variable\");\n\nexport default class Variable {\n  constructor(string, node, name, type) {\n    this.string = string;\n    this.node = node;\n    this.name = name;\n    this.type = type;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getNode() {\n    return this.node;\n  }\n\n  getName() {\n    return this.name;\n  }\n\n  getType() {\n    return this.type;\n  }\n\n  matchNode(node) {\n    const nodeMatches = this.node.match(node);\n\n    return nodeMatches;\n  }\n\n  matchName(name) {\n    const nameMatches = (this.name === name);\n\n    return nameMatches;\n  }\n\n  verify(localContext) {\n    let verified;\n\n    const variableString = this.string; ///\n\n    localContext.trace(`Verifying the '${variableString}' variable...`);\n\n    const variableNode = this.node, ///\n          variableName = variableNameFromVariableNode(variableNode),\n          variable = localContext.findVariableByVariableName(variableName);\n\n    if (variable === null) {\n      localContext.debug(`The '${variableString}' variable is not present.`);\n    } else {\n      const type = variable.getType();\n\n      this.type = type;\n\n      verified = true;\n    }\n\n    if (verified) {\n      localContext.debug(`...verified the '${variableString}' variable.`);\n    }\n\n    return verified;\n  }\n\n  verifyAtTopLevel(localContext) {\n    let verifiedAtTopLevel;\n\n    const variableString = this.string; ///\n\n    localContext.trace(`Verifying the '${variableString}' variable at top level...`);\n\n    const variableNode = this.node, ///\n          variableName = variableNameFromVariableNode(variableNode),\n          variablePresent = localContext.isVariablePresentByVariableName(variableName);\n\n    if (variablePresent) {\n      localContext.debug(`The '${variableString}' variable is already present.`);\n    } else {\n      verifiedAtTopLevel = true;\n    }\n\n    if (verifiedAtTopLevel) {\n      localContext.debug(`...verified the '${variableString}' variable at top level.`);\n    }\n\n    return verifiedAtTopLevel;\n  }\n\n  toJSON() {\n    const typeJSON = (this.type !== null) ?\n                       this.type.toJSON() :\n                         null,\n          string = this.string,\n          type = typeJSON,  ///\n          json = {\n            string,\n            type\n          };\n\n    return json;\n  }\n\n  static fromJSON(json, fileContext) {\n    const { string } = json,\n          lexer  = fileContext.getLexer(),\n          parser = fileContext.getParser(),\n          variableString = string,  ///\n          variableNode = variableNodeFromVariableString(variableString, lexer, parser),\n          variableName = variableNameFromVariableNode(variableNode),\n          node = variableNode,\n          name = variableName,  ///\n          type = typeFromJSON(json, fileContext),\n          variable = new Variable(string, node, name, type);\n\n    return variable;\n  }\n\n  static fromVariableNode(variableNode, localContext) {\n    const node = variableNode,  ///\n          variableName = variableNameFromVariableNode(variableNode),\n          string = localContext.nodeAsString(node),\n          name = variableName,  ///\n          type = null,\n          variable = new Variable(string, node, name, type);\n\n    return variable;\n  }\n\n  static fromVariableNodeAndType(variableNode, type, localContext) {\n    const node = variableNode,  ///\n          variableName = variableNameFromVariableNode(variableNode),\n          string = localContext.nodeAsString(node),\n          name = variableName,  ///\n          variable = new Variable(string, node, name, type);\n\n    return variable;\n  }\n\n  static fromVariableDeclarationNode(variableDeclarationNode, fileContext) {\n    const { Type } = shim,\n          typeNode = typeNodeQuery(variableDeclarationNode),\n          variableNode = variableNodeQuery(variableDeclarationNode),\n          variableName = variableNameFromVariableNode(variableNode),\n          localContext = LocalContext.fromFileContext(fileContext),\n          variableString = fileContext.nodeAsString(variableNode),\n          string = variableString,  ///\n          node = variableNode,  ///\n          name = variableName,  ///\n          type = (typeNode === null) ?\n                   objectType :\n                     Type.fromTypeNode(typeNode, localContext),\n          variable = new Variable(string, node, name, type);\n\n    return variable;\n  }\n}\n\nfunction typeFromJSON(json, fileContext) {\n  let { type } = json;\n\n  const { name } = type,\n        typeName = name;  ///\n\n  type = fileContext.findTypeByTypeName(typeName);\n\n  return type;\n}\n"],"names":["Variable","typeNodeQuery","nodeQuery","variableNodeQuery","string","node","name","type","getString","getNode","getName","getType","matchNode","nodeMatches","match","matchName","nameMatches","verify","localContext","verified","variableString","trace","variableNode","variableName","variableNameFromVariableNode","variable","findVariableByVariableName","debug","verifyAtTopLevel","verifiedAtTopLevel","variablePresent","isVariablePresentByVariableName","toJSON","typeJSON","json","fromJSON","fileContext","lexer","getLexer","parser","getParser","variableNodeFromVariableString","typeFromJSON","fromVariableNode","nodeAsString","fromVariableNodeAndType","fromVariableDeclarationNode","variableDeclarationNode","Type","shim","typeNode","LocalContext","fromFileContext","objectType","fromTypeNode","typeName","findTypeByTypeName"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/variable.js"],"sourcesContent":["\"use strict\";\n\nimport shim from \"./shim\";\nimport LocalContext from \"./context/local\";\n\nimport { nodeQuery } from \"./utilities/query\";\nimport { objectType } from \"./type\";\nimport { variableNameFromVariableNode} from \"./utilities/name\";\nimport { variableNodeFromVariableString } from \"./utilities/node\";\n\nconst typeNodeQuery = nodeQuery(\"/variableDeclaration/type\"),\n      variableNodeQuery = nodeQuery(\"/variableDeclaration/variable\");\n\nexport default class Variable {\n  constructor(string, node, name, type) {\n    this.string = string;\n    this.node = node;\n    this.name = name;\n    this.type = type;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getNode() {\n    return this.node;\n  }\n\n  getName() {\n    return this.name;\n  }\n\n  getType() {\n    return this.type;\n  }\n\n  matchNode(node) {\n    const nodeMatches = this.node.match(node);\n\n    return nodeMatches;\n  }\n\n  matchName(name) {\n    const nameMatches = (this.name === name);\n\n    return nameMatches;\n  }\n\n  verify(localContext) {\n    let verified;\n\n    const variableString = this.string; ///\n\n    localContext.trace(`Verifying the '${variableString}' variable...`);\n\n    const variableNode = this.node, ///\n          variableName = variableNameFromVariableNode(variableNode),\n          variable = localContext.findVariableByVariableName(variableName);\n\n    if (variable === null) {\n      localContext.debug(`The '${variableString}' variable is not present.`);\n    } else {\n      const type = variable.getType();\n\n      this.type = type;\n\n      verified = true;\n    }\n\n    if (verified) {\n      localContext.debug(`...verified the '${variableString}' variable.`);\n    }\n\n    return verified;\n  }\n\n  verifyType(fileContext) {\n    let typeVerified;\n\n    const typeName = this.type.getName();\n\n    fileContext.trace(`Verifying the '${typeName}' type...`);\n\n    const type = fileContext.findTypeByTypeName(typeName);\n\n    if (type === null) {\n      fileContext.debug(`The '${typeName}' type is missing.`);\n    } else {\n      this.type = type; ///\n\n      typeVerified = true;\n    }\n\n    if (typeVerified) {\n      fileContext.debug(`...verified the '${typeName}' type.`);\n    }\n\n    return typeVerified;\n  }\n\n  verifyAtTopLevel(fileContext) {\n    let verifiedAtTopLevel;\n\n    const variableString = this.string; ///\n\n    fileContext.trace(`Verifying the '${variableString}' variable at top level...`);\n\n    const variableNode = this.node, ///\n          variableName = variableNameFromVariableNode(variableNode),\n          variablePresent = fileContext.isVariablePresentByVariableName(variableName);\n\n    if (variablePresent) {\n      fileContext.debug(`The '${variableString}' variable is already present.`);\n    } else {\n      const typeVerified = this.verifyType(fileContext);\n\n      verifiedAtTopLevel = typeVerified;  ///\n    }\n\n    if (verifiedAtTopLevel) {\n      fileContext.debug(`...verified the '${variableString}' variable at top level.`);\n    }\n\n    return verifiedAtTopLevel;\n  }\n\n  toJSON() {\n    const typeJSON = this.type.toJSON(),\n          string = this.string,\n          type = typeJSON,  ///\n          json = {\n            string,\n            type\n          };\n\n    return json;\n  }\n\n  static fromJSON(json, fileContext) {\n    const { string } = json,\n          lexer  = fileContext.getLexer(),\n          parser = fileContext.getParser(),\n          variableString = string,  ///\n          variableNode = variableNodeFromVariableString(variableString, lexer, parser),\n          variableName = variableNameFromVariableNode(variableNode),\n          node = variableNode,\n          name = variableName,  ///\n          type = typeFromJSON(json, fileContext),\n          variable = new Variable(string, node, name, type);\n\n    return variable;\n  }\n\n  static fromVariableNode(variableNode, localContext) {\n    const node = variableNode,  ///\n          variableName = variableNameFromVariableNode(variableNode),\n          string = localContext.nodeAsString(node),\n          name = variableName,  ///\n          type = null,\n          variable = new Variable(string, node, name, type);\n\n    return variable;\n  }\n\n  static fromVariableNodeAndType(variableNode, type, localContext) {\n    const node = variableNode,  ///\n          variableName = variableNameFromVariableNode(variableNode),\n          string = localContext.nodeAsString(node),\n          name = variableName,  ///\n          variable = new Variable(string, node, name, type);\n\n    return variable;\n  }\n\n  static fromVariableDeclarationNode(variableDeclarationNode, fileContext) {\n    const { Type } = shim,\n          typeNode = typeNodeQuery(variableDeclarationNode),\n          variableNode = variableNodeQuery(variableDeclarationNode),\n          variableName = variableNameFromVariableNode(variableNode),\n          localContext = LocalContext.fromFileContext(fileContext),\n          variableString = fileContext.nodeAsString(variableNode),\n          string = variableString,  ///\n          node = variableNode,  ///\n          name = variableName,  ///\n          type = Type.fromTypeNode(typeNode, localContext),\n          variable = new Variable(string, node, name, type);\n\n    return variable;\n  }\n}\n\nfunction typeFromJSON(json, fileContext) {\n  let { type } = json;\n\n  const { name } = type,\n        typeName = name;  ///\n\n  type = fileContext.findTypeByTypeName(typeName);\n\n  return type;\n}\n"],"names":["Variable","typeNodeQuery","nodeQuery","variableNodeQuery","string","node","name","type","getString","getNode","getName","getType","matchNode","nodeMatches","match","matchName","nameMatches","verify","localContext","verified","variableString","trace","variableNode","variableName","variableNameFromVariableNode","variable","findVariableByVariableName","debug","verifyType","fileContext","typeVerified","typeName","findTypeByTypeName","verifyAtTopLevel","verifiedAtTopLevel","variablePresent","isVariablePresentByVariableName","toJSON","typeJSON","json","fromJSON","lexer","getLexer","parser","getParser","variableNodeFromVariableString","typeFromJSON","fromVariableNode","nodeAsString","fromVariableNodeAndType","fromVariableDeclarationNode","variableDeclarationNode","Type","shim","typeNode","LocalContext","fromFileContext","fromTypeNode"],"mappings":"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"}

package/lib/verifier/statementAsCombinator.js

@@ -10,8 +10,9 @@ Object.defineProperty(exports, "default", {
 });
 var _shim = /*#__PURE__*/ _interop_require_default(require("../shim"));
 var _verifier = /*#__PURE__*/ _interop_require_default(require("../verifier"));
-var _query = require("../utilities/query");
 var _local = /*#__PURE__*/ _interop_require_default(require("../context/local"));
+var _query = require("../utilities/query");
+var _name = require("../utilities/name");
 function _assert_this_initialized(self) {
     if (self === void 0) {
         throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
@@ -144,7 +145,11 @@ _define_property(StatementAsCombinatorVerifier, "maps", [
     {
         nodeQuery: typeNodeQuery,
         verify: function(typeNode, fileContext) {
-            var Type = _shim.default.Type, type = Type.fromTypeNode(typeNode, fileContext), typeVerified = type.verify(fileContext);
+            var typeVerified = false;
+            var typeName = (0, _name.typeNameFromTypeNode)(typeNode), type = fileContext.findTypeByTypeName(typeName);
+            if (type !== null) {
+                typeVerified = true;
+            }
             return typeVerified;
         }
     }
@@ -152,4 +157,4 @@ _define_property(StatementAsCombinatorVerifier, "maps", [
 var statementAsCombinatorVerifier = new StatementAsCombinatorVerifier();
 var _default = statementAsCombinatorVerifier;
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZmllci9zdGF0ZW1lbnRBc0NvbWJpbmF0b3IuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBzaGltIGZyb20gXCIuLi9zaGltXCI7XG5pbXBvcnQgVmVyaWZpZXIgZnJvbSBcIi4uL3ZlcmlmaWVyXCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcbmltcG9ydCBMb2NhbENvbnRleHQgZnJvbSBcIi4uL2NvbnRleHQvbG9jYWxcIjtcblxuY29uc3QgdGVybU5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi90ZXJtIVwiKSxcbiAgICAgIHR5cGVOb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvdHlwZSFcIiksXG4gICAgICBzdGF0ZW1lbnROb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvc3RhdGVtZW50IVwiKTtcblxuY2xhc3MgU3RhdGVtZW50QXNDb21iaW5hdG9yVmVyaWZpZXIgZXh0ZW5kcyBWZXJpZmllciB7XG4gIHZlcmlmeVN0YXRlbWVudChzdGF0ZW1lbnROb2RlLCBmaWxlQ29udGV4dCkge1xuICAgIGxldCBzdGF0ZW1lbnRWZXJpZmllZEFzQ29tYmluYXRvcjtcblxuICAgIGNvbnN0IG5vblRlcm1pbmFsTm9kZSA9IHN0YXRlbWVudE5vZGUsIC8vL1xuICAgICAgICAgIGNoaWxkTm9kZXMgPSBub25UZXJtaW5hbE5vZGUuZ2V0Q2hpbGROb2RlcygpLFxuICAgICAgICAgIGNoaWxkTm9kZXNWZXJpZmllZCA9IHRoaXMudmVyaWZ5Q2hpbGROb2RlcyhjaGlsZE5vZGVzLCBmaWxlQ29udGV4dCk7XG5cbiAgICBzdGF0ZW1lbnRWZXJpZmllZEFzQ29tYmluYXRvciA9IGNoaWxkTm9kZXNWZXJpZmllZDsgIC8vL1xuXG4gICAgcmV0dXJuIHN0YXRlbWVudFZlcmlmaWVkQXNDb21iaW5hdG9yO1xuICB9XG5cbiAgc3RhdGljIG1hcHMgPSBbXG4gICAge1xuICAgICAgbm9kZVF1ZXJ5OiBzdGF0ZW1lbnROb2RlUXVlcnksXG4gICAgICB2ZXJpZnk6IChzdGF0ZW1lbnROb2RlLCBmaWxlQ29udGV4dCkgPT4ge1xuICAgICAgICBjb25zdCB7IFN0YXRlbWVudCB9ID0gc2hpbSxcbiAgICAgICAgICAgICAgc3RhdGVtZW50ID0gU3RhdGVtZW50LmZyb21TdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUsIGZpbGVDb250ZXh0KSxcbiAgICAgICAgICAgICAgc3RhdGVkID0gZmFsc2UsXG4gICAgICAgICAgICAgIGFzc2lnbm1lbnRzID0gbnVsbCxcbiAgICAgICAgICAgICAgbG9jYWxDb250ZXh0ID0gTG9jYWxDb250ZXh0LmZyb21GaWxlQ29udGV4dChmaWxlQ29udGV4dCksXG4gICAgICAgICAgICAgIHN0YXRlbWVudFZlcmlmaWVkID0gc3RhdGVtZW50LnZlcmlmeShzdGF0ZW1lbnROb2RlLCBhc3NpZ25tZW50cywgc3RhdGVkLCBsb2NhbENvbnRleHQpO1xuXG4gICAgICAgIHJldHVybiBzdGF0ZW1lbnRWZXJpZmllZDtcbiAgICAgIH1cbiAgICB9LFxuICAgIHtcbiAgICAgIG5vZGVRdWVyeTogdGVybU5vZGVRdWVyeSxcbiAgICAgIHZlcmlmeTogKHRlcm1Ob2RlLCBmaWxlQ29udGV4dCkgPT4ge1xuICAgICAgICBjb25zdCB7IFRlcm0gfSA9IHNoaW0sXG4gICAgICAgICAgICAgIGxvY2FsQ29udGV4dCA9IExvY2FsQ29udGV4dC5mcm9tRmlsZUNvbnRleHQoZmlsZUNvbnRleHQpLFxuICAgICAgICAgICAgICB0ZXJtID0gVGVybS5mcm9tVGVybU5vZGUodGVybU5vZGUsIGxvY2FsQ29udGV4dCksXG4gICAgICAgICAgICAgIHRlcm1WZXJpZmllZCA9IHRlcm0udmVyaWZ5KGxvY2FsQ29udGV4dCwgKCkgPT4ge1xuICAgICAgICAgICAgICAgIGNvbnN0IHZlcmlmaWVkQWhlYWQgPSB0cnVlO1xuXG4gICAgICAgICAgICAgICAgcmV0dXJuIHZlcmlmaWVkQWhlYWQ7XG4gICAgICAgICAgICAgIH0pO1xuXG4gICAgICAgIHJldHVybiB0ZXJtVmVyaWZpZWQ7XG4gICAgICB9XG4gICAgfSxcbiAgICB7XG4gICAgICBub2RlUXVlcnk6IHR5cGVOb2RlUXVlcnksXG4gICAgICB2ZXJpZnk6ICh0eXBlTm9kZSwgZmlsZUNvbnRleHQpID0+IHtcbiAgICAgICAgY29uc3QgeyBUeXBlIH0gPSBzaGltLFxuICAgICAgICAgICAgICB0eXBlID0gVHlwZS5mcm9tVHlwZU5vZGUodHlwZU5vZGUsIGZpbGVDb250ZXh0KSxcbiAgICAgICAgICAgICAgdHlwZVZlcmlmaWVkID0gdHlwZS52ZXJpZnkoZmlsZUNvbnRleHQpO1xuXG4gICAgICAgIHJldHVybiB0eXBlVmVyaWZpZWQ7XG4gICAgICB9XG4gICAgfVxuICBdO1xufVxuXG5jb25zdCBzdGF0ZW1lbnRBc0NvbWJpbmF0b3JWZXJpZmllciA9IG5ldyBTdGF0ZW1lbnRBc0NvbWJpbmF0b3JWZXJpZmllcigpO1xuXG5leHBvcnQgZGVmYXVsdCBzdGF0ZW1lbnRBc0NvbWJpbmF0b3JWZXJpZmllcjtcbiJdLCJuYW1lcyI6WyJ0ZXJtTm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5IiwidHlwZU5vZGVRdWVyeSIsInN0YXRlbWVudE5vZGVRdWVyeSIsIlN0YXRlbWVudEFzQ29tYmluYXRvclZlcmlmaWVyIiwidmVyaWZ5U3RhdGVtZW50Iiwic3RhdGVtZW50Tm9kZSIsImZpbGVDb250ZXh0Iiwic3RhdGVtZW50VmVyaWZpZWRBc0NvbWJpbmF0b3IiLCJub25UZXJtaW5hbE5vZGUiLCJjaGlsZE5vZGVzIiwiZ2V0Q2hpbGROb2RlcyIsImNoaWxkTm9kZXNWZXJpZmllZCIsInZlcmlmeUNoaWxkTm9kZXMiLCJWZXJpZmllciIsIm1hcHMiLCJ2ZXJpZnkiLCJTdGF0ZW1lbnQiLCJzaGltIiwic3RhdGVtZW50IiwiZnJvbVN0YXRlbWVudE5vZGUiLCJzdGF0ZWQiLCJhc3NpZ25tZW50cyIsImxvY2FsQ29udGV4dCIsIkxvY2FsQ29udGV4dCIsImZyb21GaWxlQ29udGV4dCIsInN0YXRlbWVudFZlcmlmaWVkIiwidGVybU5vZGUiLCJUZXJtIiwidGVybSIsImZyb21UZXJtTm9kZSIsInRlcm1WZXJpZmllZCIsInZlcmlmaWVkQWhlYWQiLCJ0eXBlTm9kZSIsIlR5cGUiLCJ0eXBlIiwiZnJvbVR5cGVOb2RlIiwidHlwZVZlcmlmaWVkIiwic3RhdGVtZW50QXNDb21iaW5hdG9yVmVyaWZpZXIiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQXFFQTs7O2VBQUE7OzsyREFuRWlCOytEQUNJO3FCQUVLOzREQUNEOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUV6QixJQUFNQSxnQkFBZ0JDLElBQUFBLGdCQUFTLEVBQUMsV0FDMUJDLGdCQUFnQkQsSUFBQUEsZ0JBQVMsRUFBQyxXQUMxQkUscUJBQXFCRixJQUFBQSxnQkFBUyxFQUFDO0FBRXJDLElBQUEsQUFBTUcsOENBQU47Y0FBTUE7YUFBQUE7Z0NBQUFBO2lDQUFBQTs7a0JBQUFBOztZQUNKQyxLQUFBQTttQkFBQUEsU0FBQUEsZ0JBQWdCQyxhQUFhLEVBQUVDLFdBQVc7Z0JBQ3hDLElBQUlDO2dCQUVKLElBQU1DLGtCQUFrQkgsZUFDbEJJLGFBQWFELGdCQUFnQkUsYUFBYSxJQUMxQ0MscUJBQXFCLElBQUksQ0FBQ0MsZ0JBQWdCLENBQUNILFlBQVlIO2dCQUU3REMsZ0NBQWdDSSxvQkFBcUIsR0FBRztnQkFFeEQsT0FBT0o7WUFDVDs7O1dBWElKO0VBQXNDVSxpQkFBUTtBQWFsRCxpQkFiSVYsK0JBYUdXLFFBQU87SUFDWjtRQUNFZCxXQUFXRTtRQUNYYSxRQUFRLFNBQUNWLGVBQWVDO1lBQ3RCLElBQU0sQUFBRVUsWUFBY0MsYUFBSSxDQUFsQkQsV0FDRkUsWUFBWUYsVUFBVUcsaUJBQWlCLENBQUNkLGVBQWVDLGNBQ3ZEYyxTQUFTLE9BQ1RDLGNBQWMsTUFDZEMsZUFBZUMsY0FBWSxDQUFDQyxlQUFlLENBQUNsQixjQUM1Q21CLG9CQUFvQlAsVUFBVUgsTUFBTSxDQUFDVixlQUFlZ0IsYUFBYUQsUUFBUUU7WUFFL0UsT0FBT0c7UUFDVDtJQUNGO0lBQ0E7UUFDRXpCLFdBQVdEO1FBQ1hnQixRQUFRLFNBQUNXLFVBQVVwQjtZQUNqQixJQUFNLEFBQUVxQixPQUFTVixhQUFJLENBQWJVLE1BQ0ZMLGVBQWVDLGNBQVksQ0FBQ0MsZUFBZSxDQUFDbEIsY0FDNUNzQixPQUFPRCxLQUFLRSxZQUFZLENBQUNILFVBQVVKLGVBQ25DUSxlQUFlRixLQUFLYixNQUFNLENBQUNPLGNBQWM7Z0JBQ3ZDLElBQU1TLGdCQUFnQjtnQkFFdEIsT0FBT0E7WUFDVDtZQUVOLE9BQU9EO1FBQ1Q7SUFDRjtJQUNBO1FBQ0U5QixXQUFXQztRQUNYYyxRQUFRLFNBQUNpQixVQUFVMUI7WUFDakIsSUFBTSxBQUFFMkIsT0FBU2hCLGFBQUksQ0FBYmdCLE1BQ0ZDLE9BQU9ELEtBQUtFLFlBQVksQ0FBQ0gsVUFBVTFCLGNBQ25DOEIsZUFBZUYsS0FBS25CLE1BQU0sQ0FBQ1Q7WUFFakMsT0FBTzhCO1FBQ1Q7SUFDRjtDQUNEO0FBR0gsSUFBTUMsZ0NBQWdDLElBQUlsQztJQUUxQyxXQUFla0MifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZmllci9zdGF0ZW1lbnRBc0NvbWJpbmF0b3IuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBzaGltIGZyb20gXCIuLi9zaGltXCI7XG5pbXBvcnQgVmVyaWZpZXIgZnJvbSBcIi4uL3ZlcmlmaWVyXCI7XG5pbXBvcnQgTG9jYWxDb250ZXh0IGZyb20gXCIuLi9jb250ZXh0L2xvY2FsXCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcbmltcG9ydCB7IHR5cGVOYW1lRnJvbVR5cGVOb2RlIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9uYW1lXCI7XG5cbmNvbnN0IHRlcm1Ob2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvdGVybSFcIiksXG4gICAgICB0eXBlTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3R5cGUhXCIpLFxuICAgICAgc3RhdGVtZW50Tm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3N0YXRlbWVudCFcIik7XG5cbmNsYXNzIFN0YXRlbWVudEFzQ29tYmluYXRvclZlcmlmaWVyIGV4dGVuZHMgVmVyaWZpZXIge1xuICB2ZXJpZnlTdGF0ZW1lbnQoc3RhdGVtZW50Tm9kZSwgZmlsZUNvbnRleHQpIHtcbiAgICBsZXQgc3RhdGVtZW50VmVyaWZpZWRBc0NvbWJpbmF0b3I7XG5cbiAgICBjb25zdCBub25UZXJtaW5hbE5vZGUgPSBzdGF0ZW1lbnROb2RlLCAvLy9cbiAgICAgICAgICBjaGlsZE5vZGVzID0gbm9uVGVybWluYWxOb2RlLmdldENoaWxkTm9kZXMoKSxcbiAgICAgICAgICBjaGlsZE5vZGVzVmVyaWZpZWQgPSB0aGlzLnZlcmlmeUNoaWxkTm9kZXMoY2hpbGROb2RlcywgZmlsZUNvbnRleHQpO1xuXG4gICAgc3RhdGVtZW50VmVyaWZpZWRBc0NvbWJpbmF0b3IgPSBjaGlsZE5vZGVzVmVyaWZpZWQ7ICAvLy9cblxuICAgIHJldHVybiBzdGF0ZW1lbnRWZXJpZmllZEFzQ29tYmluYXRvcjtcbiAgfVxuXG4gIHN0YXRpYyBtYXBzID0gW1xuICAgIHtcbiAgICAgIG5vZGVRdWVyeTogc3RhdGVtZW50Tm9kZVF1ZXJ5LFxuICAgICAgdmVyaWZ5OiAoc3RhdGVtZW50Tm9kZSwgZmlsZUNvbnRleHQpID0+IHtcbiAgICAgICAgY29uc3QgeyBTdGF0ZW1lbnQgfSA9IHNoaW0sXG4gICAgICAgICAgICAgIHN0YXRlbWVudCA9IFN0YXRlbWVudC5mcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlLCBmaWxlQ29udGV4dCksXG4gICAgICAgICAgICAgIHN0YXRlZCA9IGZhbHNlLFxuICAgICAgICAgICAgICBhc3NpZ25tZW50cyA9IG51bGwsXG4gICAgICAgICAgICAgIGxvY2FsQ29udGV4dCA9IExvY2FsQ29udGV4dC5mcm9tRmlsZUNvbnRleHQoZmlsZUNvbnRleHQpLFxuICAgICAgICAgICAgICBzdGF0ZW1lbnRWZXJpZmllZCA9IHN0YXRlbWVudC52ZXJpZnkoc3RhdGVtZW50Tm9kZSwgYXNzaWdubWVudHMsIHN0YXRlZCwgbG9jYWxDb250ZXh0KTtcblxuICAgICAgICByZXR1cm4gc3RhdGVtZW50VmVyaWZpZWQ7XG4gICAgICB9XG4gICAgfSxcbiAgICB7XG4gICAgICBub2RlUXVlcnk6IHRlcm1Ob2RlUXVlcnksXG4gICAgICB2ZXJpZnk6ICh0ZXJtTm9kZSwgZmlsZUNvbnRleHQpID0+IHtcbiAgICAgICAgY29uc3QgeyBUZXJtIH0gPSBzaGltLFxuICAgICAgICAgICAgICBsb2NhbENvbnRleHQgPSBMb2NhbENvbnRleHQuZnJvbUZpbGVDb250ZXh0KGZpbGVDb250ZXh0KSxcbiAgICAgICAgICAgICAgdGVybSA9IFRlcm0uZnJvbVRlcm1Ob2RlKHRlcm1Ob2RlLCBsb2NhbENvbnRleHQpLFxuICAgICAgICAgICAgICB0ZXJtVmVyaWZpZWQgPSB0ZXJtLnZlcmlmeShsb2NhbENvbnRleHQsICgpID0+IHtcbiAgICAgICAgICAgICAgICBjb25zdCB2ZXJpZmllZEFoZWFkID0gdHJ1ZTtcblxuICAgICAgICAgICAgICAgIHJldHVybiB2ZXJpZmllZEFoZWFkO1xuICAgICAgICAgICAgICB9KTtcblxuICAgICAgICByZXR1cm4gdGVybVZlcmlmaWVkO1xuICAgICAgfVxuICAgIH0sXG4gICAge1xuICAgICAgbm9kZVF1ZXJ5OiB0eXBlTm9kZVF1ZXJ5LFxuICAgICAgdmVyaWZ5OiAodHlwZU5vZGUsIGZpbGVDb250ZXh0KSA9PiB7XG4gICAgICAgIGxldCB0eXBlVmVyaWZpZWQgPSBmYWxzZTtcblxuICAgICAgICBjb25zdCB0eXBlTmFtZSA9IHR5cGVOYW1lRnJvbVR5cGVOb2RlKHR5cGVOb2RlKSxcbiAgICAgICAgICAgICAgdHlwZSA9IGZpbGVDb250ZXh0LmZpbmRUeXBlQnlUeXBlTmFtZSh0eXBlTmFtZSk7XG5cbiAgICAgICAgaWYgKHR5cGUgIT09IG51bGwpIHtcbiAgICAgICAgICB0eXBlVmVyaWZpZWQgPSB0cnVlO1xuICAgICAgICB9XG5cbiAgICAgICAgcmV0dXJuIHR5cGVWZXJpZmllZDtcbiAgICAgIH1cbiAgICB9XG4gIF07XG59XG5cbmNvbnN0IHN0YXRlbWVudEFzQ29tYmluYXRvclZlcmlmaWVyID0gbmV3IFN0YXRlbWVudEFzQ29tYmluYXRvclZlcmlmaWVyKCk7XG5cbmV4cG9ydCBkZWZhdWx0IHN0YXRlbWVudEFzQ29tYmluYXRvclZlcmlmaWVyO1xuIl0sIm5hbWVzIjpbInRlcm1Ob2RlUXVlcnkiLCJub2RlUXVlcnkiLCJ0eXBlTm9kZVF1ZXJ5Iiwic3RhdGVtZW50Tm9kZVF1ZXJ5IiwiU3RhdGVtZW50QXNDb21iaW5hdG9yVmVyaWZpZXIiLCJ2ZXJpZnlTdGF0ZW1lbnQiLCJzdGF0ZW1lbnROb2RlIiwiZmlsZUNvbnRleHQiLCJzdGF0ZW1lbnRWZXJpZmllZEFzQ29tYmluYXRvciIsIm5vblRlcm1pbmFsTm9kZSIsImNoaWxkTm9kZXMiLCJnZXRDaGlsZE5vZGVzIiwiY2hpbGROb2Rlc1ZlcmlmaWVkIiwidmVyaWZ5Q2hpbGROb2RlcyIsIlZlcmlmaWVyIiwibWFwcyIsInZlcmlmeSIsIlN0YXRlbWVudCIsInNoaW0iLCJzdGF0ZW1lbnQiLCJmcm9tU3RhdGVtZW50Tm9kZSIsInN0YXRlZCIsImFzc2lnbm1lbnRzIiwibG9jYWxDb250ZXh0IiwiTG9jYWxDb250ZXh0IiwiZnJvbUZpbGVDb250ZXh0Iiwic3RhdGVtZW50VmVyaWZpZWQiLCJ0ZXJtTm9kZSIsIlRlcm0iLCJ0ZXJtIiwiZnJvbVRlcm1Ob2RlIiwidGVybVZlcmlmaWVkIiwidmVyaWZpZWRBaGVhZCIsInR5cGVOb2RlIiwidHlwZVZlcmlmaWVkIiwidHlwZU5hbWUiLCJ0eXBlTmFtZUZyb21UeXBlTm9kZSIsInR5cGUiLCJmaW5kVHlwZUJ5VHlwZU5hbWUiLCJzdGF0ZW1lbnRBc0NvbWJpbmF0b3JWZXJpZmllciJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBMkVBOzs7ZUFBQTs7OzJEQXpFaUI7K0RBQ0k7NERBQ0k7cUJBRUM7b0JBQ1c7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRXJDLElBQU1BLGdCQUFnQkMsSUFBQUEsZ0JBQVMsRUFBQyxXQUMxQkMsZ0JBQWdCRCxJQUFBQSxnQkFBUyxFQUFDLFdBQzFCRSxxQkFBcUJGLElBQUFBLGdCQUFTLEVBQUM7QUFFckMsSUFBQSxBQUFNRyw4Q0FBTjtjQUFNQTthQUFBQTtnQ0FBQUE7aUNBQUFBOztrQkFBQUE7O1lBQ0pDLEtBQUFBO21CQUFBQSxTQUFBQSxnQkFBZ0JDLGFBQWEsRUFBRUMsV0FBVztnQkFDeEMsSUFBSUM7Z0JBRUosSUFBTUMsa0JBQWtCSCxlQUNsQkksYUFBYUQsZ0JBQWdCRSxhQUFhLElBQzFDQyxxQkFBcUIsSUFBSSxDQUFDQyxnQkFBZ0IsQ0FBQ0gsWUFBWUg7Z0JBRTdEQyxnQ0FBZ0NJLG9CQUFxQixHQUFHO2dCQUV4RCxPQUFPSjtZQUNUOzs7V0FYSUo7RUFBc0NVLGlCQUFRO0FBYWxELGlCQWJJViwrQkFhR1csUUFBTztJQUNaO1FBQ0VkLFdBQVdFO1FBQ1hhLFFBQVEsU0FBQ1YsZUFBZUM7WUFDdEIsSUFBTSxBQUFFVSxZQUFjQyxhQUFJLENBQWxCRCxXQUNGRSxZQUFZRixVQUFVRyxpQkFBaUIsQ0FBQ2QsZUFBZUMsY0FDdkRjLFNBQVMsT0FDVEMsY0FBYyxNQUNkQyxlQUFlQyxjQUFZLENBQUNDLGVBQWUsQ0FBQ2xCLGNBQzVDbUIsb0JBQW9CUCxVQUFVSCxNQUFNLENBQUNWLGVBQWVnQixhQUFhRCxRQUFRRTtZQUUvRSxPQUFPRztRQUNUO0lBQ0Y7SUFDQTtRQUNFekIsV0FBV0Q7UUFDWGdCLFFBQVEsU0FBQ1csVUFBVXBCO1lBQ2pCLElBQU0sQUFBRXFCLE9BQVNWLGFBQUksQ0FBYlUsTUFDRkwsZUFBZUMsY0FBWSxDQUFDQyxlQUFlLENBQUNsQixjQUM1Q3NCLE9BQU9ELEtBQUtFLFlBQVksQ0FBQ0gsVUFBVUosZUFDbkNRLGVBQWVGLEtBQUtiLE1BQU0sQ0FBQ08sY0FBYztnQkFDdkMsSUFBTVMsZ0JBQWdCO2dCQUV0QixPQUFPQTtZQUNUO1lBRU4sT0FBT0Q7UUFDVDtJQUNGO0lBQ0E7UUFDRTlCLFdBQVdDO1FBQ1hjLFFBQVEsU0FBQ2lCLFVBQVUxQjtZQUNqQixJQUFJMkIsZUFBZTtZQUVuQixJQUFNQyxXQUFXQyxJQUFBQSwwQkFBb0IsRUFBQ0gsV0FDaENJLE9BQU85QixZQUFZK0Isa0JBQWtCLENBQUNIO1lBRTVDLElBQUlFLFNBQVMsTUFBTTtnQkFDakJILGVBQWU7WUFDakI7WUFFQSxPQUFPQTtRQUNUO0lBQ0Y7Q0FDRDtBQUdILElBQU1LLGdDQUFnQyxJQUFJbkM7SUFFMUMsV0FBZW1DIn0=

package/lib/verifier/termAsConstructor.js

@@ -12,6 +12,7 @@ var _shim = /*#__PURE__*/ _interop_require_default(require("../shim"));
 var _verifier = /*#__PURE__*/ _interop_require_default(require("../verifier"));
 var _local = /*#__PURE__*/ _interop_require_default(require("../context/local"));
 var _query = require("../utilities/query");
+var _name = require("../utilities/name");
 function _assert_this_initialized(self) {
     if (self === void 0) {
         throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
@@ -137,7 +138,14 @@ _define_property(TermAsConstructorVerifier, "maps", [
     {
         nodeQuery: typeNodeQuery,
         verify: function(typeNode, fileContext, verifyAhead) {
-            var Type = _shim.default.Type, type = Type.fromTypeNode(typeNode, fileContext), localContext = _local.default.fromFileContext(fileContext), typeVerified = type.verify(localContext, verifyAhead);
+            var typeVerified = false;
+            var typeName = (0, _name.typeNameFromTypeNode)(typeNode), type = fileContext.findTypeByTypeName(typeName);
+            if (type !== null) {
+                var verifiedAhead = verifyAhead();
+                if (verifiedAhead) {
+                    typeVerified = true;
+                }
+            }
             return typeVerified;
         }
     }
@@ -145,4 +153,4 @@ _define_property(TermAsConstructorVerifier, "maps", [
 var termAsConstructorVerifier = new TermAsConstructorVerifier();
 var _default = termAsConstructorVerifier;
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZmllci90ZXJtQXNDb25zdHJ1Y3Rvci5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHNoaW0gZnJvbSBcIi4uL3NoaW1cIjtcbmltcG9ydCBWZXJpZmllciBmcm9tIFwiLi4vdmVyaWZpZXJcIjtcbmltcG9ydCBMb2NhbENvbnRleHQgZnJvbSBcIi4uL2NvbnRleHQvbG9jYWxcIjtcblxuaW1wb3J0IHsgbm9kZVF1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5jb25zdCB0ZXJtTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3Rlcm0hXCIpLFxuICAgICAgdHlwZU5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi90eXBlIVwiKTtcblxuY2xhc3MgVGVybUFzQ29uc3RydWN0b3JWZXJpZmllciBleHRlbmRzIFZlcmlmaWVyIHtcbiAgdmVyaWZ5VGVybSh0ZXJtTm9kZSwgZmlsZUNvbnRleHQpIHtcbiAgICBsZXQgdGVybVZlcmlmaWVkQXNDb25zdHJ1Y3RvcjtcblxuICAgIGNvbnN0IG5vblRlcm1pbmFsTm9kZSA9IHRlcm1Ob2RlLCAvLy9cbiAgICAgICAgICBjaGlsZE5vZGVzID0gbm9uVGVybWluYWxOb2RlLmdldENoaWxkTm9kZXMoKSxcbiAgICAgICAgICBjaGlsZE5vZGVzVmVyaWZpZWQgPSB0aGlzLnZlcmlmeUNoaWxkTm9kZXMoY2hpbGROb2RlcywgZmlsZUNvbnRleHQsICgpID0+IHtcbiAgICAgICAgICAgIGNvbnN0IHZlcmlmaWVkQWhlYWQgPSB0cnVlO1xuXG4gICAgICAgICAgICByZXR1cm4gdmVyaWZpZWRBaGVhZDtcbiAgICAgICAgICB9KTtcblxuICAgIHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3IgPSBjaGlsZE5vZGVzVmVyaWZpZWQ7ICAvLy9cblxuICAgIHJldHVybiB0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yO1xuICB9XG5cbiAgc3RhdGljIG1hcHMgPSBbXG4gICAge1xuICAgICAgbm9kZVF1ZXJ5OiB0ZXJtTm9kZVF1ZXJ5LFxuICAgICAgdmVyaWZ5OiAodGVybU5vZGUsIGZpbGVDb250ZXh0LCB2ZXJpZnlBaGVhZCkgPT4ge1xuICAgICAgICBjb25zdCB7IFRlcm0gfSA9IHNoaW0sXG4gICAgICAgICAgICAgIGxvY2FsQ29udGV4dCA9IExvY2FsQ29udGV4dC5mcm9tRmlsZUNvbnRleHQoZmlsZUNvbnRleHQpLFxuICAgICAgICAgICAgICB0ZXJtID0gVGVybS5mcm9tVGVybU5vZGUodGVybU5vZGUsIGxvY2FsQ29udGV4dCksXG4gICAgICAgICAgICAgIHRlcm1WZXJpZmllZCA9IHRlcm0udmVyaWZ5KGxvY2FsQ29udGV4dCwgdmVyaWZ5QWhlYWQpO1xuXG4gICAgICAgIHJldHVybiB0ZXJtVmVyaWZpZWQ7XG4gICAgICB9XG4gICAgfSxcbiAgICB7XG4gICAgICBub2RlUXVlcnk6IHR5cGVOb2RlUXVlcnksXG4gICAgICB2ZXJpZnk6ICh0eXBlTm9kZSwgZmlsZUNvbnRleHQsIHZlcmlmeUFoZWFkKSA9PiB7XG4gICAgICAgIGNvbnN0IHsgVHlwZSB9ID0gc2hpbSxcbiAgICAgICAgICAgICAgdHlwZSA9IFR5cGUuZnJvbVR5cGVOb2RlKHR5cGVOb2RlLCBmaWxlQ29udGV4dCksXG4gICAgICAgICAgICAgIGxvY2FsQ29udGV4dCA9IExvY2FsQ29udGV4dC5mcm9tRmlsZUNvbnRleHQoZmlsZUNvbnRleHQpLFxuICAgICAgICAgICAgICB0eXBlVmVyaWZpZWQgPSB0eXBlLnZlcmlmeShsb2NhbENvbnRleHQsIHZlcmlmeUFoZWFkKTtcblxuICAgICAgICByZXR1cm4gdHlwZVZlcmlmaWVkO1xuICAgICAgfVxuICAgIH1cbiAgXTtcbn1cblxuY29uc3QgdGVybUFzQ29uc3RydWN0b3JWZXJpZmllciA9IG5ldyBUZXJtQXNDb25zdHJ1Y3RvclZlcmlmaWVyKCk7XG5cbmV4cG9ydCBkZWZhdWx0IHRlcm1Bc0NvbnN0cnVjdG9yVmVyaWZpZXI7XG4iXSwibmFtZXMiOlsidGVybU5vZGVRdWVyeSIsIm5vZGVRdWVyeSIsInR5cGVOb2RlUXVlcnkiLCJUZXJtQXNDb25zdHJ1Y3RvclZlcmlmaWVyIiwidmVyaWZ5VGVybSIsInRlcm1Ob2RlIiwiZmlsZUNvbnRleHQiLCJ0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yIiwibm9uVGVybWluYWxOb2RlIiwiY2hpbGROb2RlcyIsImdldENoaWxkTm9kZXMiLCJjaGlsZE5vZGVzVmVyaWZpZWQiLCJ2ZXJpZnlDaGlsZE5vZGVzIiwidmVyaWZpZWRBaGVhZCIsIlZlcmlmaWVyIiwibWFwcyIsInZlcmlmeSIsInZlcmlmeUFoZWFkIiwiVGVybSIsInNoaW0iLCJsb2NhbENvbnRleHQiLCJMb2NhbENvbnRleHQiLCJmcm9tRmlsZUNvbnRleHQiLCJ0ZXJtIiwiZnJvbVRlcm1Ob2RlIiwidGVybVZlcmlmaWVkIiwidHlwZU5vZGUiLCJUeXBlIiwidHlwZSIsImZyb21UeXBlTm9kZSIsInR5cGVWZXJpZmllZCIsInRlcm1Bc0NvbnN0cnVjdG9yVmVyaWZpZXIiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQXdEQTs7O2VBQUE7OzsyREF0RGlCOytEQUNJOzREQUNJO3FCQUVDOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUUxQixJQUFNQSxnQkFBZ0JDLElBQUFBLGdCQUFTLEVBQUMsV0FDMUJDLGdCQUFnQkQsSUFBQUEsZ0JBQVMsRUFBQztBQUVoQyxJQUFBLEFBQU1FLDBDQUFOO2NBQU1BO2FBQUFBO2dDQUFBQTtpQ0FBQUE7O2tCQUFBQTs7WUFDSkMsS0FBQUE7bUJBQUFBLFNBQUFBLFdBQVdDLFFBQVEsRUFBRUMsV0FBVztnQkFDOUIsSUFBSUM7Z0JBRUosSUFBTUMsa0JBQWtCSCxVQUNsQkksYUFBYUQsZ0JBQWdCRSxhQUFhLElBQzFDQyxxQkFBcUIsSUFBSSxDQUFDQyxnQkFBZ0IsQ0FBQ0gsWUFBWUgsYUFBYTtvQkFDbEUsSUFBTU8sZ0JBQWdCO29CQUV0QixPQUFPQTtnQkFDVDtnQkFFTk4sNEJBQTRCSSxvQkFBcUIsR0FBRztnQkFFcEQsT0FBT0o7WUFDVDs7O1dBZklKO0VBQWtDVyxpQkFBUTtBQWlCOUMsaUJBakJJWCwyQkFpQkdZLFFBQU87SUFDWjtRQUNFZCxXQUFXRDtRQUNYZ0IsUUFBUSxTQUFDWCxVQUFVQyxhQUFhVztZQUM5QixJQUFNLEFBQUVDLE9BQVNDLGFBQUksQ0FBYkQsTUFDRkUsZUFBZUMsY0FBWSxDQUFDQyxlQUFlLENBQUNoQixjQUM1Q2lCLE9BQU9MLEtBQUtNLFlBQVksQ0FBQ25CLFVBQVVlLGVBQ25DSyxlQUFlRixLQUFLUCxNQUFNLENBQUNJLGNBQWNIO1lBRS9DLE9BQU9RO1FBQ1Q7SUFDRjtJQUNBO1FBQ0V4QixXQUFXQztRQUNYYyxRQUFRLFNBQUNVLFVBQVVwQixhQUFhVztZQUM5QixJQUFNLEFBQUVVLE9BQVNSLGFBQUksQ0FBYlEsTUFDRkMsT0FBT0QsS0FBS0UsWUFBWSxDQUFDSCxVQUFVcEIsY0FDbkNjLGVBQWVDLGNBQVksQ0FBQ0MsZUFBZSxDQUFDaEIsY0FDNUN3QixlQUFlRixLQUFLWixNQUFNLENBQUNJLGNBQWNIO1lBRS9DLE9BQU9hO1FBQ1Q7SUFDRjtDQUNEO0FBR0gsSUFBTUMsNEJBQTRCLElBQUk1QjtJQUV0QyxXQUFlNEIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZmllci90ZXJtQXNDb25zdHJ1Y3Rvci5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHNoaW0gZnJvbSBcIi4uL3NoaW1cIjtcbmltcG9ydCBWZXJpZmllciBmcm9tIFwiLi4vdmVyaWZpZXJcIjtcbmltcG9ydCBMb2NhbENvbnRleHQgZnJvbSBcIi4uL2NvbnRleHQvbG9jYWxcIjtcblxuaW1wb3J0IHsgbm9kZVF1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuaW1wb3J0IHt0eXBlTmFtZUZyb21UeXBlTm9kZX0gZnJvbSBcIi4uL3V0aWxpdGllcy9uYW1lXCI7XG5cbmNvbnN0IHRlcm1Ob2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvdGVybSFcIiksXG4gICAgICB0eXBlTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3R5cGUhXCIpO1xuXG5jbGFzcyBUZXJtQXNDb25zdHJ1Y3RvclZlcmlmaWVyIGV4dGVuZHMgVmVyaWZpZXIge1xuICB2ZXJpZnlUZXJtKHRlcm1Ob2RlLCBmaWxlQ29udGV4dCkge1xuICAgIGxldCB0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yO1xuXG4gICAgY29uc3Qgbm9uVGVybWluYWxOb2RlID0gdGVybU5vZGUsIC8vL1xuICAgICAgICAgIGNoaWxkTm9kZXMgPSBub25UZXJtaW5hbE5vZGUuZ2V0Q2hpbGROb2RlcygpLFxuICAgICAgICAgIGNoaWxkTm9kZXNWZXJpZmllZCA9IHRoaXMudmVyaWZ5Q2hpbGROb2RlcyhjaGlsZE5vZGVzLCBmaWxlQ29udGV4dCwgKCkgPT4ge1xuICAgICAgICAgICAgY29uc3QgdmVyaWZpZWRBaGVhZCA9IHRydWU7XG5cbiAgICAgICAgICAgIHJldHVybiB2ZXJpZmllZEFoZWFkO1xuICAgICAgICAgIH0pO1xuXG4gICAgdGVybVZlcmlmaWVkQXNDb25zdHJ1Y3RvciA9IGNoaWxkTm9kZXNWZXJpZmllZDsgIC8vL1xuXG4gICAgcmV0dXJuIHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3I7XG4gIH1cblxuICBzdGF0aWMgbWFwcyA9IFtcbiAgICB7XG4gICAgICBub2RlUXVlcnk6IHRlcm1Ob2RlUXVlcnksXG4gICAgICB2ZXJpZnk6ICh0ZXJtTm9kZSwgZmlsZUNvbnRleHQsIHZlcmlmeUFoZWFkKSA9PiB7XG4gICAgICAgIGNvbnN0IHsgVGVybSB9ID0gc2hpbSxcbiAgICAgICAgICAgICAgbG9jYWxDb250ZXh0ID0gTG9jYWxDb250ZXh0LmZyb21GaWxlQ29udGV4dChmaWxlQ29udGV4dCksXG4gICAgICAgICAgICAgIHRlcm0gPSBUZXJtLmZyb21UZXJtTm9kZSh0ZXJtTm9kZSwgbG9jYWxDb250ZXh0KSxcbiAgICAgICAgICAgICAgdGVybVZlcmlmaWVkID0gdGVybS52ZXJpZnkobG9jYWxDb250ZXh0LCB2ZXJpZnlBaGVhZCk7XG5cbiAgICAgICAgcmV0dXJuIHRlcm1WZXJpZmllZDtcbiAgICAgIH1cbiAgICB9LFxuICAgIHtcbiAgICAgIG5vZGVRdWVyeTogdHlwZU5vZGVRdWVyeSxcbiAgICAgIHZlcmlmeTogKHR5cGVOb2RlLCBmaWxlQ29udGV4dCwgdmVyaWZ5QWhlYWQpID0+IHtcbiAgICAgICAgbGV0IHR5cGVWZXJpZmllZCA9IGZhbHNlO1xuXG4gICAgICAgIGNvbnN0IHR5cGVOYW1lID0gdHlwZU5hbWVGcm9tVHlwZU5vZGUodHlwZU5vZGUpLFxuICAgICAgICAgICAgICB0eXBlID0gZmlsZUNvbnRleHQuZmluZFR5cGVCeVR5cGVOYW1lKHR5cGVOYW1lKTtcblxuICAgICAgICBpZiAodHlwZSAhPT0gbnVsbCkge1xuICAgICAgICAgIGNvbnN0IHZlcmlmaWVkQWhlYWQgPSB2ZXJpZnlBaGVhZCgpO1xuXG4gICAgICAgICAgaWYgKHZlcmlmaWVkQWhlYWQpIHtcbiAgICAgICAgICAgIHR5cGVWZXJpZmllZCA9IHRydWU7XG4gICAgICAgICAgfVxuICAgICAgICB9XG5cbiAgICAgICAgcmV0dXJuIHR5cGVWZXJpZmllZDtcbiAgICAgIH1cbiAgICB9XG4gIF07XG59XG5cbmNvbnN0IHRlcm1Bc0NvbnN0cnVjdG9yVmVyaWZpZXIgPSBuZXcgVGVybUFzQ29uc3RydWN0b3JWZXJpZmllcigpO1xuXG5leHBvcnQgZGVmYXVsdCB0ZXJtQXNDb25zdHJ1Y3RvclZlcmlmaWVyO1xuIl0sIm5hbWVzIjpbInRlcm1Ob2RlUXVlcnkiLCJub2RlUXVlcnkiLCJ0eXBlTm9kZVF1ZXJ5IiwiVGVybUFzQ29uc3RydWN0b3JWZXJpZmllciIsInZlcmlmeVRlcm0iLCJ0ZXJtTm9kZSIsImZpbGVDb250ZXh0IiwidGVybVZlcmlmaWVkQXNDb25zdHJ1Y3RvciIsIm5vblRlcm1pbmFsTm9kZSIsImNoaWxkTm9kZXMiLCJnZXRDaGlsZE5vZGVzIiwiY2hpbGROb2Rlc1ZlcmlmaWVkIiwidmVyaWZ5Q2hpbGROb2RlcyIsInZlcmlmaWVkQWhlYWQiLCJWZXJpZmllciIsIm1hcHMiLCJ2ZXJpZnkiLCJ2ZXJpZnlBaGVhZCIsIlRlcm0iLCJzaGltIiwibG9jYWxDb250ZXh0IiwiTG9jYWxDb250ZXh0IiwiZnJvbUZpbGVDb250ZXh0IiwidGVybSIsImZyb21UZXJtTm9kZSIsInRlcm1WZXJpZmllZCIsInR5cGVOb2RlIiwidHlwZVZlcmlmaWVkIiwidHlwZU5hbWUiLCJ0eXBlTmFtZUZyb21UeXBlTm9kZSIsInR5cGUiLCJmaW5kVHlwZUJ5VHlwZU5hbWUiLCJ0ZXJtQXNDb25zdHJ1Y3RvclZlcmlmaWVyIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFpRUE7OztlQUFBOzs7MkRBL0RpQjsrREFDSTs0REFDSTtxQkFFQztvQkFDUzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFbkMsSUFBTUEsZ0JBQWdCQyxJQUFBQSxnQkFBUyxFQUFDLFdBQzFCQyxnQkFBZ0JELElBQUFBLGdCQUFTLEVBQUM7QUFFaEMsSUFBQSxBQUFNRSwwQ0FBTjtjQUFNQTthQUFBQTtnQ0FBQUE7aUNBQUFBOztrQkFBQUE7O1lBQ0pDLEtBQUFBO21CQUFBQSxTQUFBQSxXQUFXQyxRQUFRLEVBQUVDLFdBQVc7Z0JBQzlCLElBQUlDO2dCQUVKLElBQU1DLGtCQUFrQkgsVUFDbEJJLGFBQWFELGdCQUFnQkUsYUFBYSxJQUMxQ0MscUJBQXFCLElBQUksQ0FBQ0MsZ0JBQWdCLENBQUNILFlBQVlILGFBQWE7b0JBQ2xFLElBQU1PLGdCQUFnQjtvQkFFdEIsT0FBT0E7Z0JBQ1Q7Z0JBRU5OLDRCQUE0Qkksb0JBQXFCLEdBQUc7Z0JBRXBELE9BQU9KO1lBQ1Q7OztXQWZJSjtFQUFrQ1csaUJBQVE7QUFpQjlDLGlCQWpCSVgsMkJBaUJHWSxRQUFPO0lBQ1o7UUFDRWQsV0FBV0Q7UUFDWGdCLFFBQVEsU0FBQ1gsVUFBVUMsYUFBYVc7WUFDOUIsSUFBTSxBQUFFQyxPQUFTQyxhQUFJLENBQWJELE1BQ0ZFLGVBQWVDLGNBQVksQ0FBQ0MsZUFBZSxDQUFDaEIsY0FDNUNpQixPQUFPTCxLQUFLTSxZQUFZLENBQUNuQixVQUFVZSxlQUNuQ0ssZUFBZUYsS0FBS1AsTUFBTSxDQUFDSSxjQUFjSDtZQUUvQyxPQUFPUTtRQUNUO0lBQ0Y7SUFDQTtRQUNFeEIsV0FBV0M7UUFDWGMsUUFBUSxTQUFDVSxVQUFVcEIsYUFBYVc7WUFDOUIsSUFBSVUsZUFBZTtZQUVuQixJQUFNQyxXQUFXQyxJQUFBQSwwQkFBb0IsRUFBQ0gsV0FDaENJLE9BQU94QixZQUFZeUIsa0JBQWtCLENBQUNIO1lBRTVDLElBQUlFLFNBQVMsTUFBTTtnQkFDakIsSUFBTWpCLGdCQUFnQkk7Z0JBRXRCLElBQUlKLGVBQWU7b0JBQ2pCYyxlQUFlO2dCQUNqQjtZQUNGO1lBRUEsT0FBT0E7UUFDVDtJQUNGO0NBQ0Q7QUFHSCxJQUFNSyw0QkFBNEIsSUFBSTdCO0lBRXRDLFdBQWU2QiJ9

package/package.json

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

package/src/declaration/variable.js

@@ -1,10 +1,9 @@
 "use strict";
 
-import shim from "../shim";
 import Variable from "../variable";
 
 import { nodeQuery } from "../utilities/query";
-import { objectType } from "../type";
+import { typeNameFromTypeNode } from "../utilities/name";
 
 const typeNodeQuery = nodeQuery("/variableDeclaration/type");
 
@@ -50,30 +49,26 @@ export default class VariableDeclaration {
   }
 
   static fromVariableDeclarationNode(variableDeclarationNode, fileContext) {
-    const { Type } = shim,
-          typeNode = typeNodeQuery(variableDeclarationNode),
-          type = (typeNode === null) ?
-                   objectType :
-                     Type.fromTypeNode(typeNode, fileContext),
+    const typeNode = typeNodeQuery(variableDeclarationNode),
           variable = Variable.fromVariableDeclarationNode(variableDeclarationNode, fileContext),
-          string = stringFromVariableAndType(variable, type),
+          string = stringFromVariableAndTypeNode(variable, typeNode),
           variableDeclaration = new VariableDeclaration(fileContext, string, variable);
 
     return variableDeclaration;
   }
 }
 
-function stringFromVariableAndType(variable, type) {
+function stringFromVariableAndTypeNode(variable, typeNode) {
   let string;
 
   const variableString = variable.getString();
 
-  if (type === null) {
+  if (typeNode === null) {
     string = variableString;  ///
   } else {
-    const typeString = type.getString();
+    const typeName = typeNameFromTypeNode(typeNode);
 
-    string = `${variableString}:${typeString}`;
+    string = `${variableString}:${typeName}`;
   }
 
   return string;

package/src/term.js

@@ -136,26 +136,22 @@ class Term {
   verifyType(fileContext) {
     let typeVerified;
 
-    if (this.type === null) {
-      typeVerified = true;
-    } else {
-      const typeName = this.type.getName();
+    const typeName = this.type.getName();
 
-      fileContext.trace(`Verifying the '${typeName}' type...`);
+    fileContext.trace(`Verifying the '${typeName}' type...`);
 
-      const type = fileContext.findTypeByTypeName(typeName);
+    const type = fileContext.findTypeByTypeName(typeName);
 
-      if (type === null) {
-        fileContext.debug(`The '${typeName}' type is missing.`);
-      } else {
-        this.type = type; ///
+    if (type === null) {
+      fileContext.debug(`The '${typeName}' type is missing.`);
+    } else {
+      this.type = type; ///
 
-        typeVerified = true;
-      }
+      typeVerified = true;
+    }
 
-      if (typeVerified) {
-        fileContext.debug(`...verified the '${typeName}' type.`);
-      }
+    if (typeVerified) {
+      fileContext.debug(`...verified the '${typeName}' type.`);
     }
 
     return typeVerified;
@@ -197,11 +193,13 @@ class Term {
 
     fileContext.trace(`Verifying the '${termString}' term at top level...`);
 
-    const termNode = this.node,
+    const termNode = this.node, ///
           termVerifiedAsConstructor = termAsConstructorVerifier.verifyTerm(termNode, fileContext);
 
     if (termVerifiedAsConstructor) {
-      verifiedAtTopLevel = true;
+      const typeVerified = this.verifyType(fileContext);
+
+      verifiedAtTopLevel = typeVerified;  ///
     }
 
     if (verifiedAtTopLevel) {
@@ -212,9 +210,7 @@ class Term {
   }
 
   toJSON() {
-    const typeJSON = (this.type !== null) ?
-                       this.type.toJSON() :
-                         null,
+    const typeJSON = this.type.toJSON(),
           string = this.string,
           type = typeJSON,  ///
           json = {

package/src/type.js

@@ -131,9 +131,20 @@ class Type {
     const typePresent = fileContext.isTypePresentByTypeName(this.name);
 
     if (typePresent) {
-      verified = true;
+      const superTypeName = this.superType.getName(),
+            superType = fileContext.findTypeByTypeName(superTypeName);
+
+      if (superType === null) {
+        const superTypeString = this.superType.asString();
+
+        fileContext.debug(`The '${superTypeString}' super-type is not present.`);
+      } else {
+        this.superType = superType;
+
+        verified = true;
+      }
     } else {
-      fileContext.debug(`The type '${typeString}' is not present.`);
+      fileContext.debug(`The '${typeString}' type is not present.`);
     }
 
     if (verified) {
@@ -177,9 +188,7 @@ class Type {
   }
 
   toJSON() {
-    const superTypeJSON = (this.superType !== null) ?
-                            this.superType.toJSON() :
-                              null,
+    const superTypeJSON = this.superType.toJSON(),
           name = this.name,
           superType = superTypeJSON,  ///
           json = {
@@ -201,11 +210,18 @@ class Type {
   }
 
   static fromTypeNode(typeNode) {
-    const typeName = typeNameFromTypeNode(typeNode),
-          name = typeName,  ///
-          string = name,  ///
-          superType = null,
-          type = new Type(string, name, superType);
+    let type;
+
+    if (typeNode === null) {
+      type = objectType;
+    } else {
+      const typeName = typeNameFromTypeNode(typeNode),
+            name = typeName,  ///
+            string = name,  ///
+            superType = null;
+
+      type = new Type(string, name, superType);
+    }
 
     return type;
   }
@@ -214,9 +230,7 @@ class Type {
     const typeNode = typeNodeQuery(typeDeclarationNode),
           superTypeNode = superTypeNodeQuery(typeDeclarationNode),
           typeName = typeNameFromTypeNode(typeNode),
-          superType = (superTypeNode === null) ?
-                        objectType :
-                          Type.fromTypeNode(superTypeNode),
+          superType = Type.fromTypeNode(superTypeNode),
           string = stringFromTypeNameAndSuperType(typeName, superType),
           name = typeName,  ///
           type = new Type(string, name, superType);

package/src/unifier/metavariable.js

@@ -4,6 +4,7 @@ import shim from "../shim";
 import Unifier from "../unifier";
 
 import { nodeQuery } from "../utilities/query";
+import { typeNameFromTypeNode } from "../utilities/name";
 
 const typeNodeQuery = nodeQuery("/type!"),
       termNodeQuery = nodeQuery("/term!");
@@ -28,12 +29,12 @@ class MetavariableUnifier extends Unifier {
       unify: (termNodeA, typeNodeB, localContext) => {
         let unified = false;
 
-        const { Term, Type } = shim,
+        const { Term } = shim,
               typeNode = typeNodeB, ///
-              type = Type.fromTypeNode(typeNode, localContext),
-              typeVerified = type.verify(localContext);
+              typeName = typeNameFromTypeNode(typeNode),
+              type = localContext.findTypeByTypeName(typeName);
 
-        if (typeVerified) {
+        if (type !== null) {
           const termNode = termNodeA, ///
                 term = Term.fromTermNode(termNode, localContext),
                 termVerifiedGivenType = term.verifyGivenType(type, localContext);

package/src/unifier/statementWithCombinator.js

@@ -4,6 +4,8 @@ import shim from "../shim";
 import Unifier from "../unifier";
 
 import { nodeQuery } from "../utilities/query";
+import { typeNameFromTypeNode } from "../utilities/name";
+import local from "../context/local";
 
 const termNodeQuery = nodeQuery("/term!"),
       typeNodeQuery = nodeQuery("/type!"),
@@ -67,12 +69,12 @@ class StatementWithCombinatorUnifier extends Unifier {
       unify: (termNodeA, typeNodeB, assignments, stated, localContext) => {
         let unified = false;
 
-        const { Term, Type } = shim,
+        const { Term } = shim,
               typeNode = typeNodeB, ///
-              type = Type.fromTypeNode(typeNode, localContext),
-              typeVerified = type.verify(localContext);
+              typeName = typeNameFromTypeNode(typeNode),
+              type = localContext.findTypeByTypeName(typeName);
 
-        if (typeVerified) {
+        if (type !== null) {
           const termNode = termNodeA, ///
                 term = Term.fromTermNode(termNode, localContext),
                 termVerifiedGivenType = term.verifyGivenType(type, localContext);

package/src/unifier/termWithConstructor.js

@@ -4,6 +4,7 @@ import shim from "../shim";
 import Unifier from "../unifier";
 
 import { nodeQuery } from "../utilities/query";
+import { typeNameFromTypeNode } from "../utilities/name";
 
 const termNodeQuery = nodeQuery("/term"),
       typeNodeQuery = nodeQuery("/type");
@@ -28,12 +29,12 @@ class TermWithConstructorUnifier extends Unifier {
       unify: (termNodeA, typeNodeB, localContext) => {
         let unified = false;
 
-        const { Term, Type } = shim,
+        const { Term } = shim,
               typeNode = typeNodeB, ///
-              type = Type.fromTypeNode(typeNode, localContext),
-              typeVerified = type.verify(localContext);
+              typeName = typeNameFromTypeNode(typeNode),
+              type = localContext.findTypeByTypeName(typeName);
 
-        if (typeVerified) {
+        if (type !== null) {
           const termNode = termNodeA, ///
                 term = Term.fromTermNode(termNode, localContext),
                 termVerifiedGivenType = term.verifyGivenType(type, localContext);

package/src/variable.js

@@ -75,34 +75,58 @@ export default class Variable {
     return verified;
   }
 
-  verifyAtTopLevel(localContext) {
+  verifyType(fileContext) {
+    let typeVerified;
+
+    const typeName = this.type.getName();
+
+    fileContext.trace(`Verifying the '${typeName}' type...`);
+
+    const type = fileContext.findTypeByTypeName(typeName);
+
+    if (type === null) {
+      fileContext.debug(`The '${typeName}' type is missing.`);
+    } else {
+      this.type = type; ///
+
+      typeVerified = true;
+    }
+
+    if (typeVerified) {
+      fileContext.debug(`...verified the '${typeName}' type.`);
+    }
+
+    return typeVerified;
+  }
+
+  verifyAtTopLevel(fileContext) {
     let verifiedAtTopLevel;
 
     const variableString = this.string; ///
 
-    localContext.trace(`Verifying the '${variableString}' variable at top level...`);
+    fileContext.trace(`Verifying the '${variableString}' variable at top level...`);
 
     const variableNode = this.node, ///
           variableName = variableNameFromVariableNode(variableNode),
-          variablePresent = localContext.isVariablePresentByVariableName(variableName);
+          variablePresent = fileContext.isVariablePresentByVariableName(variableName);
 
     if (variablePresent) {
-      localContext.debug(`The '${variableString}' variable is already present.`);
+      fileContext.debug(`The '${variableString}' variable is already present.`);
     } else {
-      verifiedAtTopLevel = true;
+      const typeVerified = this.verifyType(fileContext);
+
+      verifiedAtTopLevel = typeVerified;  ///
     }
 
     if (verifiedAtTopLevel) {
-      localContext.debug(`...verified the '${variableString}' variable at top level.`);
+      fileContext.debug(`...verified the '${variableString}' variable at top level.`);
     }
 
     return verifiedAtTopLevel;
   }
 
   toJSON() {
-    const typeJSON = (this.type !== null) ?
-                       this.type.toJSON() :
-                         null,
+    const typeJSON = this.type.toJSON(),
           string = this.string,
           type = typeJSON,  ///
           json = {
@@ -159,9 +183,7 @@ export default class Variable {
           string = variableString,  ///
           node = variableNode,  ///
           name = variableName,  ///
-          type = (typeNode === null) ?
-                   objectType :
-                     Type.fromTypeNode(typeNode, localContext),
+          type = Type.fromTypeNode(typeNode, localContext),
           variable = new Variable(string, node, name, type);
 
     return variable;

package/src/verifier/statementAsCombinator.js

@@ -2,9 +2,10 @@
 
 import shim from "../shim";
 import Verifier from "../verifier";
+import LocalContext from "../context/local";
 
 import { nodeQuery } from "../utilities/query";
-import LocalContext from "../context/local";
+import { typeNameFromTypeNode } from "../utilities/name";
 
 const termNodeQuery = nodeQuery("/term!"),
       typeNodeQuery = nodeQuery("/type!"),
@@ -55,9 +56,14 @@ class StatementAsCombinatorVerifier extends Verifier {
     {
       nodeQuery: typeNodeQuery,
       verify: (typeNode, fileContext) => {
-        const { Type } = shim,
-              type = Type.fromTypeNode(typeNode, fileContext),
-              typeVerified = type.verify(fileContext);
+        let typeVerified = false;
+
+        const typeName = typeNameFromTypeNode(typeNode),
+              type = fileContext.findTypeByTypeName(typeName);
+
+        if (type !== null) {
+          typeVerified = true;
+        }
 
         return typeVerified;
       }

package/src/verifier/termAsConstructor.js

@@ -5,6 +5,7 @@ import Verifier from "../verifier";
 import LocalContext from "../context/local";
 
 import { nodeQuery } from "../utilities/query";
+import {typeNameFromTypeNode} from "../utilities/name";
 
 const termNodeQuery = nodeQuery("/term!"),
       typeNodeQuery = nodeQuery("/type!");
@@ -41,10 +42,18 @@ class TermAsConstructorVerifier extends Verifier {
     {
       nodeQuery: typeNodeQuery,
       verify: (typeNode, fileContext, verifyAhead) => {
-        const { Type } = shim,
-              type = Type.fromTypeNode(typeNode, fileContext),
-              localContext = LocalContext.fromFileContext(fileContext),
-              typeVerified = type.verify(localContext, verifyAhead);
+        let typeVerified = false;
+
+        const typeName = typeNameFromTypeNode(typeNode),
+              type = fileContext.findTypeByTypeName(typeName);
+
+        if (type !== null) {
+          const verifiedAhead = verifyAhead();
+
+          if (verifiedAhead) {
+            typeVerified = true;
+          }
+        }
 
         return typeVerified;
       }