occam-verify-cli 0.0.1024 → 0.0.1027

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":"AAAA;;;;;;;eAaqBA;;;2DAXJ;4DACQ;qBAEC;oBACC;oBACiB;oBACG;;;;;;;;;;;;;;;;;;;;;;;;;AAE/C,IAAMC,gBAAgBC,IAAAA,gBAAS,EAAC,8BAC1BC,oBAAoBD,IAAAA,gBAAS,EAAC;AAErB,IAAA,AAAMF,yBAAN;aAAMA,SACPI,MAAM,EAAEC,IAAI,EAAEC,IAAI,EAAEC,IAAI;gCADjBP;QAEjB,IAAI,CAACI,MAAM,GAAGA;QACd,IAAI,CAACC,IAAI,GAAGA;QACZ,IAAI,CAACC,IAAI,GAAGA;QACZ,IAAI,CAACC,IAAI,GAAGA;;kBALKP;;YAQnBQ,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACJ,MAAM;YACpB;;;YAEAK,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACJ,IAAI;YAClB;;;YAEAK,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACJ,IAAI;YAClB;;;YAEAK,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACJ,IAAI;YAClB;;;YAEAK,KAAAA;mBAAAA,SAAAA,UAAUP,IAAI;gBACZ,IAAMQ,cAAc,IAAI,CAACR,IAAI,CAACS,KAAK,CAACT;gBAEpC,OAAOQ;YACT;;;YAEAE,KAAAA;mBAAAA,SAAAA,UAAUT,IAAI;gBACZ,IAAMU,cAAe,IAAI,CAACV,IAAI,KAAKA;gBAEnC,OAAOU;YACT;;;YAEAC,KAAAA;mBAAAA,SAAAA,OAAOC,YAAY;gBACjB,IAAIC;gBAEJ,IAAMC,iBAAiB,IAAI,CAAChB,MAAM,EAAE,GAAG;gBAEvCc,aAAaG,KAAK,CAAC,AAAC,kBAAgC,OAAfD,gBAAe;gBAEpD,IAAME,eAAe,IAAI,CAACjB,IAAI,EACxBkB,eAAeC,IAAAA,kCAA4B,EAACF,eAC5CG,WAAWP,aAAaQ,0BAA0B,CAACH;gBAEzD,IAAIE,aAAa,MAAM;oBACrBP,aAAaS,KAAK,CAAC,AAAC,QAAsB,OAAfP,gBAAe;gBAC5C,OAAO;oBACL,IAAMb,OAAOkB,SAASd,OAAO;oBAE7B,IAAI,CAACJ,IAAI,GAAGA;oBAEZY,WAAW;gBACb;gBAEA,IAAIA,UAAU;oBACZD,aAAaS,KAAK,CAAC,AAAC,oBAAkC,OAAfP,gBAAe;gBACxD;gBAEA,OAAOD;YACT;;;YAEAS,KAAAA;mBAAAA,SAAAA,iBAAiBV,YAAY;gBAC3B,IAAIW;gBAEJ,IAAMT,iBAAiB,IAAI,CAAChB,MAAM,EAAE,GAAG;gBAEvCc,aAAaG,KAAK,CAAC,AAAC,kBAAgC,OAAfD,gBAAe;gBAEpD,IAAME,eAAe,IAAI,CAACjB,IAAI,EACxBkB,eAAeC,IAAAA,kCAA4B,EAACF,eAC5CQ,kBAAkBZ,aAAaa,+BAA+B,CAACR;gBAErE,IAAIO,iBAAiB;oBACnBZ,aAAaS,KAAK,CAAC,AAAC,QAAsB,OAAfP,gBAAe;gBAC5C,OAAO;oBACLS,qBAAqB;gBACvB;gBAEA,IAAIA,oBAAoB;oBACtBX,aAAaS,KAAK,CAAC,AAAC,oBAAkC,OAAfP,gBAAe;gBACxD;gBAEA,OAAOS;YACT;;;YAEAG,KAAAA;mBAAAA,SAAAA;gBACE,IAAMC,WAAW,AAAC,IAAI,CAAC1B,IAAI,KAAK,OACb,IAAI,CAACA,IAAI,CAACyB,MAAM,KACd,MACf5B,SAAS,IAAI,CAACA,MAAM,EACpBG,OAAO0B,UACPC,OAAO;oBACL9B,QAAAA;oBACAG,MAAAA;gBACF;gBAEN,OAAO2B;YACT;;;;YAEOC,KAAAA;mBAAP,SAAOA,SAASD,IAAI,EAAEE,WAAW;gBAC/B,IAAM,AAAEhC,SAAW8B,KAAX9B,QACFiC,QAASD,YAAYE,QAAQ,IAC7BC,SAASH,YAAYI,SAAS,IAC9BpB,iBAAiBhB,QACjBkB,eAAemB,IAAAA,oCAA8B,EAACrB,gBAAgBiB,OAAOE,SACrEhB,eAAeC,IAAAA,kCAA4B,EAACF,eAC5CjB,OAAOiB,cACPhB,OAAOiB,cACPhB,OAAOmC,aAAaR,MAAME,cAC1BX,WAAW,IAhHAzB,SAgHaI,QAAQC,MAAMC,MAAMC;gBAElD,OAAOkB;YACT;;;YAEOkB,KAAAA;mBAAP,SAAOA,iBAAiBrB,YAAY,EAAEJ,YAAY;gBAChD,IAAMb,OAAOiB,cACPC,eAAeC,IAAAA,kCAA4B,EAACF,eAC5ClB,SAASc,aAAa0B,YAAY,CAACvC,OACnCC,OAAOiB,cACPhB,OAAO,MACPkB,WAAW,IA3HAzB,SA2HaI,QAAQC,MAAMC,MAAMC;gBAElD,OAAOkB;YACT;;;YAEOoB,KAAAA;mBAAP,SAAOA,wBAAwBvB,YAAY,EAAEf,IAAI,EAAEW,YAAY;gBAC7D,IAAMb,OAAOiB,cACPC,eAAeC,IAAAA,kCAA4B,EAACF,eAC5ClB,SAASc,aAAa0B,YAAY,CAACvC,OACnCC,OAAOiB,cACPE,WAAW,IArIAzB,SAqIaI,QAAQC,MAAMC,MAAMC;gBAElD,OAAOkB;YACT;;;YAEOqB,KAAAA;mBAAP,SAAOA,4BAA4BC,uBAAuB,EAAEX,WAAW;gBACrE,IAAM,AAAEY,OAASC,aAAI,CAAbD,MACFE,WAAWjD,cAAc8C,0BACzBzB,eAAenB,kBAAkB4C,0BACjCxB,eAAeC,IAAAA,kCAA4B,EAACF,eAC5CJ,eAAeiC,cAAY,CAACC,eAAe,CAAChB,cAC5ChB,iBAAiBgB,YAAYQ,YAAY,CAACtB,eAC1ClB,SAASgB,gBACTf,OAAOiB,cACPhB,OAAOiB,cACPhB,OAAO,AAAC2C,aAAa,OACZG,gBAAU,GACRL,KAAKM,YAAY,CAACJ,UAAUhC,eACvCO,WAAW,IAvJAzB,SAuJaI,QAAQC,MAAMC,MAAMC;gBAElD,OAAOkB;YACT;;;WA1JmBzB;;AA6JrB,SAAS0C,aAAaR,IAAI,EAAEE,WAAW;IACrC,IAAI,AAAE7B,OAAS2B,KAAT3B;IAEN,IAAM,AAAED,OAASC,KAATD,MACFiD,WAAWjD,MAAO,GAAG;IAE3BC,OAAO6B,YAAYoB,kBAAkB,CAACD;IAEtC,OAAOhD;AACT"}
+//# 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.1024",
+  "version": "0.0.1027",
   "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/metavariable.js

@@ -165,10 +165,12 @@ export default class Metavariable {
 function metaTypeFromJSON(json, fileContext) {
   let { metaType } = json;
 
-  const { name } = metaType,
-        metaTypeName = name;  ///
+  if (metaType !== null) {
+    const { name } = metaType,
+          metaTypeName = name;  ///
 
-  metaType = fileContext.findMetaTypeByMetaTypeName(metaTypeName);
+    metaType = fileContext.findMetaTypeByMetaTypeName(metaTypeName);
+  }
 
   return metaType;
 }

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;
       }