occam-verify-cli 0.0.455 → 0.0.456

package/lib/verify/termAsConstructor.js

@@ -24,7 +24,9 @@ function verifyTermAsConstructor(termNode, typeNode, fileContext) {
     var termVerifiedAsConstructor = false;
     fileContext.begin(termNode);
     var type = null;
-    var nonTerminalNode = termNode, childNodes = nonTerminalNode.getChildNodes(), childNodesVerified = verifyChildNodes(childNodes, fileContext);
+    var nonTerminalNode = termNode, termString = (0, _string.nodeAsString)(termNode);
+    fileContext.debug("Verifying the '".concat(termString, "' constructor..."));
+    var childNodes = nonTerminalNode.getChildNodes(), childNodesVerified = verifyChildNodes(childNodes, fileContext);
     if (childNodesVerified) {
         if (typeNode === null) {
             termVerifiedAsConstructor = true;
@@ -34,7 +36,6 @@ function verifyTermAsConstructor(termNode, typeNode, fileContext) {
             if (type !== null) {
                 termVerifiedAsConstructor = true;
             } else {
-                var termString = (0, _string.nodeAsString)(termNode);
                 fileContext.error("The '".concat(termString, "' constructor's '").concat(typeName, "' type is missing."));
             }
         }
@@ -44,8 +45,7 @@ function verifyTermAsConstructor(termNode, typeNode, fileContext) {
         fileContext.addConstructor(constructor);
     }
     if (termVerifiedAsConstructor) {
-        var termString1 = (0, _string.nodeAsString)(termNode);
-        fileContext.info("Verified the '".concat(termString1, "' constructor."));
+        fileContext.info("Verified the '".concat(termString, "' constructor."));
     }
     termVerifiedAsConstructor ? fileContext.complete(termNode) : fileContext.halt(termNode);
     return termVerifiedAsConstructor;
@@ -125,4 +125,4 @@ function verifyNonTerminalNode(nonTerminalNode, fileContext) {
     return nonTerminalNodeVerified;
 }
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/termAsConstructor.js"],"sourcesContent":["\"use strict\";\n\nimport verifyTerm from \"../verify/term\";\nimport Constructor from \"../constructor\";\n\nimport { first } from \"../utilities/array\";\nimport { nodeAsString } from \"../utilities/string\";\nimport { nodeQuery, typeNameFromTypeNode } from \"../utilities/query\";\nimport { TERM_RULE_NAME, ARGUMENT_RULE_NAME } from \"../ruleNames\";\n\nconst typeNodeQuery = nodeQuery(\"/argument/type\");\n\nexport default function verifyTermAsConstructor(termNode, typeNode, fileContext) {\n  let termVerifiedAsConstructor = false;\n\n  fileContext.begin(termNode);\n\n  let type = null;\n\n  const nonTerminalNode = termNode,  ///\n        childNodes = nonTerminalNode.getChildNodes(),\n        childNodesVerified = verifyChildNodes(childNodes, fileContext);\n\n  if (childNodesVerified) {\n    if (typeNode === null) {\n      termVerifiedAsConstructor = true;\n    } else {\n      const typeName = typeNameFromTypeNode(typeNode);\n\n      type = fileContext.findTypeByTypeName(typeName);\n\n      if (type !== null) {\n        termVerifiedAsConstructor = true;\n      } else {\n        const termString = nodeAsString(termNode);\n\n        fileContext.error(`The '${termString}' constructor's '${typeName}' type is missing.`);\n      }\n    }\n  }\n\n  if (termVerifiedAsConstructor) {\n    const constructor = Constructor.fromTermNodeAndType(termNode, type);\n\n    fileContext.addConstructor(constructor);\n  }\n\n  if (termVerifiedAsConstructor) {\n    const termString = nodeAsString(termNode);\n\n    fileContext.info(`Verified the '${termString}' constructor.`);\n  }\n\n  termVerifiedAsConstructor ?\n    fileContext.complete(termNode) :\n      fileContext.halt(termNode);\n\n  return termVerifiedAsConstructor;\n}\n\nfunction verifyNode(node, fileContext) {\n  let nodeVerified;\n\n  const nodeTerminalNode = node.isTerminalNode();\n\n  if (nodeTerminalNode) {\n    const terminalNode = node,  ///\n          terminalNodeVerified = verifyTerminalNode(terminalNode, fileContext);\n\n    nodeVerified = terminalNodeVerified;  ///\n  } else {\n    const nonTerminalNode = node, ///\n          nonTerminalNodeVerified = verifyNonTerminalNode(nonTerminalNode, fileContext);\n\n    nodeVerified = nonTerminalNodeVerified; ///\n  }\n\n  return nodeVerified;\n}\n\nfunction verifyChildNodes(childNodes, fileContext) {\n  const childNodesVerified = childNodes.every((childNode) => {\n    const node = childNode, ///\n          nodeVerified = verifyNode(node, fileContext);\n\n    if (nodeVerified) {\n      return true;\n    }\n  });\n\n  return childNodesVerified;\n}\n\nfunction verifyTerminalNode(terminalNode, fileContext) {\n  const terminalNodeVerified = true;\n\n  return terminalNodeVerified;\n}\n\nfunction verifyArgumentNode(argumentNode, fileContext) {\n  let typeNodeVerified = false;\n\n  const typeNode = typeNodeQuery(argumentNode);\n\n  if (typeNode === null) {\n    const argumentString = nodeAsString(argumentNode);\n\n    fileContext.error(`The ${argumentString} argument should be a type.`);\n  } else {\n    const typeName = typeNameFromTypeNode(typeNode),\n          typePresent = fileContext.isTypePresentByTypeName(typeName);\n\n    if (!typePresent) {\n      fileContext.error(`The type '${typeName}' is missing.`);\n    } else {\n      typeNodeVerified = true;\n    }\n  }\n\n  return typeNodeVerified;\n}\n\nfunction verifyNonTerminalNode(nonTerminalNode, fileContext) {\n  let nonTerminalNodeVerified;\n\n  const ruleName = nonTerminalNode.getRuleName();\n\n  switch (ruleName) {\n    case ARGUMENT_RULE_NAME: {\n      const argumentNode = nonTerminalNode, ///\n            argumentNodeVerified = verifyArgumentNode(argumentNode, fileContext);\n\n      nonTerminalNodeVerified = argumentNodeVerified; ///\n\n      break;\n    }\n\n    case TERM_RULE_NAME: {\n      const termNode = nonTerminalNode, ///\n            types = [],\n            context = fileContext,  ///\n            termVerified = verifyTerm(termNode, types, context);\n\n      if (termVerified) {\n        const firstType = first(types),\n              type = firstType; ///\n\n        if (type !== null) {\n          const termString = nodeAsString(termNode);\n\n          fileContext.error(`The type of the constructor's compound '${termString}' term node is not null.`);\n        } else {\n          nonTerminalNodeVerified = true; ///\n        }\n      }\n\n      break;\n    }\n\n    default: {\n      const childNodes = nonTerminalNode.getChildNodes(),\n            childNodesVerified = verifyChildNodes(childNodes, fileContext);\n\n      nonTerminalNodeVerified = childNodesVerified; ///\n\n      break;\n    }\n  }\n\n  return nonTerminalNodeVerified;\n}\n\n"],"names":["verifyTermAsConstructor","typeNodeQuery","nodeQuery","termNode","typeNode","fileContext","termVerifiedAsConstructor","begin","type","nonTerminalNode","childNodes","getChildNodes","childNodesVerified","verifyChildNodes","typeName","typeNameFromTypeNode","findTypeByTypeName","termString","nodeAsString","error","constructor","Constructor","fromTermNodeAndType","addConstructor","info","complete","halt","verifyNode","node","nodeVerified","nodeTerminalNode","isTerminalNode","terminalNode","terminalNodeVerified","verifyTerminalNode","nonTerminalNodeVerified","verifyNonTerminalNode","every","childNode","verifyArgumentNode","argumentNode","typeNodeVerified","argumentString","typePresent","isTypePresentByTypeName","ruleName","getRuleName","ARGUMENT_RULE_NAME","argumentNodeVerified","TERM_RULE_NAME","types","context","termVerified","verifyTerm","firstType","first"],"mappings":"AAAA;;;;+BAYA;;;eAAwBA;;;yDAVD;gEACC;qBAEF;sBACO;qBACmB;yBACG;;;;;;AAEnD,IAAMC,gBAAgBC,IAAAA,gBAAS,EAAC;AAEjB,SAASF,wBAAwBG,QAAQ,EAAEC,QAAQ,EAAEC,WAAW,EAAE;IAC/E,IAAIC,4BAA4B,KAAK;IAErCD,YAAYE,KAAK,CAACJ;IAElB,IAAIK,OAAO,IAAI;IAEf,IAAMC,kBAAkBN,UAClBO,aAAaD,gBAAgBE,aAAa,IAC1CC,qBAAqBC,iBAAiBH,YAAYL;IAExD,IAAIO,oBAAoB;QACtB,IAAIR,aAAa,IAAI,EAAE;YACrBE,4BAA4B,IAAI;QAClC,OAAO;YACL,IAAMQ,WAAWC,IAAAA,2BAAoB,EAACX;YAEtCI,OAAOH,YAAYW,kBAAkB,CAACF;YAEtC,IAAIN,SAAS,IAAI,EAAE;gBACjBF,4BAA4B,IAAI;YAClC,OAAO;gBACL,IAAMW,aAAaC,IAAAA,oBAAY,EAACf;gBAEhCE,YAAYc,KAAK,CAAC,AAAC,QAAqCL,OAA9BG,YAAW,qBAA4B,OAATH,UAAS;YACnE,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAIR,2BAA2B;QAC7B,IAAMc,cAAcC,oBAAW,CAACC,mBAAmB,CAACnB,UAAUK;QAE9DH,YAAYkB,cAAc,CAACH;IAC7B,CAAC;IAED,IAAId,2BAA2B;QAC7B,IAAMW,cAAaC,IAAAA,oBAAY,EAACf;QAEhCE,YAAYmB,IAAI,CAAC,AAAC,iBAA2B,OAAXP,aAAW;IAC/C,CAAC;IAEDX,4BACED,YAAYoB,QAAQ,CAACtB,YACnBE,YAAYqB,IAAI,CAACvB,SAAS;IAE9B,OAAOG;AACT;AAEA,SAASqB,WAAWC,IAAI,EAAEvB,WAAW,EAAE;IACrC,IAAIwB;IAEJ,IAAMC,mBAAmBF,KAAKG,cAAc;IAE5C,IAAID,kBAAkB;QACpB,IAAME,eAAeJ,MACfK,uBAAuBC,mBAAmBF,cAAc3B;QAE9DwB,eAAeI,sBAAuB,GAAG;IAC3C,OAAO;QACL,IAAMxB,kBAAkBmB,MAClBO,0BAA0BC,sBAAsB3B,iBAAiBJ;QAEvEwB,eAAeM,yBAAyB,GAAG;IAC7C,CAAC;IAED,OAAON;AACT;AAEA,SAAShB,iBAAiBH,UAAU,EAAEL,WAAW,EAAE;IACjD,IAAMO,qBAAqBF,WAAW2B,KAAK,CAAC,SAACC,WAAc;QACzD,IAAMV,OAAOU,WACPT,eAAeF,WAAWC,MAAMvB;QAEtC,IAAIwB,cAAc;YAChB,OAAO,IAAI;QACb,CAAC;IACH;IAEA,OAAOjB;AACT;AAEA,SAASsB,mBAAmBF,YAAY,EAAE3B,WAAW,EAAE;IACrD,IAAM4B,uBAAuB,IAAI;IAEjC,OAAOA;AACT;AAEA,SAASM,mBAAmBC,YAAY,EAAEnC,WAAW,EAAE;IACrD,IAAIoC,mBAAmB,KAAK;IAE5B,IAAMrC,WAAWH,cAAcuC;IAE/B,IAAIpC,aAAa,IAAI,EAAE;QACrB,IAAMsC,iBAAiBxB,IAAAA,oBAAY,EAACsB;QAEpCnC,YAAYc,KAAK,CAAC,AAAC,OAAqB,OAAfuB,gBAAe;IAC1C,OAAO;QACL,IAAM5B,WAAWC,IAAAA,2BAAoB,EAACX,WAChCuC,cAActC,YAAYuC,uBAAuB,CAAC9B;QAExD,IAAI,CAAC6B,aAAa;YAChBtC,YAAYc,KAAK,CAAC,AAAC,aAAqB,OAATL,UAAS;QAC1C,OAAO;YACL2B,mBAAmB,IAAI;QACzB,CAAC;IACH,CAAC;IAED,OAAOA;AACT;AAEA,SAASL,sBAAsB3B,eAAe,EAAEJ,WAAW,EAAE;IAC3D,IAAI8B;IAEJ,IAAMU,WAAWpC,gBAAgBqC,WAAW;IAE5C,OAAQD;QACN,KAAKE,6BAAkB;YAAE;gBACvB,IAAMP,eAAe/B,iBACfuC,uBAAuBT,mBAAmBC,cAAcnC;gBAE9D8B,0BAA0Ba,sBAAsB,GAAG;gBAEnD,KAAM;YACR;QAEA,KAAKC,yBAAc;YAAE;gBACnB,IAAM9C,WAAWM,iBACXyC,QAAQ,EAAE,EACVC,UAAU9C,aACV+C,eAAeC,IAAAA,aAAU,EAAClD,UAAU+C,OAAOC;gBAEjD,IAAIC,cAAc;oBAChB,IAAME,YAAYC,IAAAA,YAAK,EAACL,QAClB1C,OAAO8C,WAAW,GAAG;oBAE3B,IAAI9C,SAAS,IAAI,EAAE;wBACjB,IAAMS,aAAaC,IAAAA,oBAAY,EAACf;wBAEhCE,YAAYc,KAAK,CAAC,AAAC,2CAAqD,OAAXF,YAAW;oBAC1E,OAAO;wBACLkB,0BAA0B,IAAI,EAAE,GAAG;oBACrC,CAAC;gBACH,CAAC;gBAED,KAAM;YACR;QAEA;YAAS;gBACP,IAAMzB,aAAaD,gBAAgBE,aAAa,IAC1CC,qBAAqBC,iBAAiBH,YAAYL;gBAExD8B,0BAA0BvB,oBAAoB,GAAG;gBAEjD,KAAM;YACR;IACF;IAEA,OAAOuB;AACT"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/termAsConstructor.js"],"sourcesContent":["\"use strict\";\n\nimport verifyTerm from \"../verify/term\";\nimport Constructor from \"../constructor\";\n\nimport { first } from \"../utilities/array\";\nimport { nodeAsString } from \"../utilities/string\";\nimport { nodeQuery, typeNameFromTypeNode } from \"../utilities/query\";\nimport { TERM_RULE_NAME, ARGUMENT_RULE_NAME } from \"../ruleNames\";\n\nconst typeNodeQuery = nodeQuery(\"/argument/type\");\n\nexport default function verifyTermAsConstructor(termNode, typeNode, fileContext) {\n  let termVerifiedAsConstructor = false;\n\n  fileContext.begin(termNode);\n\n  let type = null;\n\n  const nonTerminalNode = termNode,  ///\n        termString = nodeAsString(termNode);\n\n  fileContext.debug(`Verifying the '${termString}' constructor...`);\n\n  const childNodes = nonTerminalNode.getChildNodes(),\n        childNodesVerified = verifyChildNodes(childNodes, fileContext);\n\n  if (childNodesVerified) {\n    if (typeNode === null) {\n      termVerifiedAsConstructor = true;\n    } else {\n      const typeName = typeNameFromTypeNode(typeNode);\n\n      type = fileContext.findTypeByTypeName(typeName);\n\n      if (type !== null) {\n        termVerifiedAsConstructor = true;\n      } else {\n        fileContext.error(`The '${termString}' constructor's '${typeName}' type is missing.`);\n      }\n    }\n  }\n\n  if (termVerifiedAsConstructor) {\n    const constructor = Constructor.fromTermNodeAndType(termNode, type);\n\n    fileContext.addConstructor(constructor);\n  }\n\n  if (termVerifiedAsConstructor) {\n    fileContext.info(`Verified the '${termString}' constructor.`);\n  }\n\n  termVerifiedAsConstructor ?\n    fileContext.complete(termNode) :\n      fileContext.halt(termNode);\n\n  return termVerifiedAsConstructor;\n}\n\nfunction verifyNode(node, fileContext) {\n  let nodeVerified;\n\n  const nodeTerminalNode = node.isTerminalNode();\n\n  if (nodeTerminalNode) {\n    const terminalNode = node,  ///\n          terminalNodeVerified = verifyTerminalNode(terminalNode, fileContext);\n\n    nodeVerified = terminalNodeVerified;  ///\n  } else {\n    const nonTerminalNode = node, ///\n          nonTerminalNodeVerified = verifyNonTerminalNode(nonTerminalNode, fileContext);\n\n    nodeVerified = nonTerminalNodeVerified; ///\n  }\n\n  return nodeVerified;\n}\n\nfunction verifyChildNodes(childNodes, fileContext) {\n  const childNodesVerified = childNodes.every((childNode) => {\n    const node = childNode, ///\n          nodeVerified = verifyNode(node, fileContext);\n\n    if (nodeVerified) {\n      return true;\n    }\n  });\n\n  return childNodesVerified;\n}\n\nfunction verifyTerminalNode(terminalNode, fileContext) {\n  const terminalNodeVerified = true;\n\n  return terminalNodeVerified;\n}\n\nfunction verifyArgumentNode(argumentNode, fileContext) {\n  let typeNodeVerified = false;\n\n  const typeNode = typeNodeQuery(argumentNode);\n\n  if (typeNode === null) {\n    const argumentString = nodeAsString(argumentNode);\n\n    fileContext.error(`The ${argumentString} argument should be a type.`);\n  } else {\n    const typeName = typeNameFromTypeNode(typeNode),\n          typePresent = fileContext.isTypePresentByTypeName(typeName);\n\n    if (!typePresent) {\n      fileContext.error(`The type '${typeName}' is missing.`);\n    } else {\n      typeNodeVerified = true;\n    }\n  }\n\n  return typeNodeVerified;\n}\n\nfunction verifyNonTerminalNode(nonTerminalNode, fileContext) {\n  let nonTerminalNodeVerified;\n\n  const ruleName = nonTerminalNode.getRuleName();\n\n  switch (ruleName) {\n    case ARGUMENT_RULE_NAME: {\n      const argumentNode = nonTerminalNode, ///\n            argumentNodeVerified = verifyArgumentNode(argumentNode, fileContext);\n\n      nonTerminalNodeVerified = argumentNodeVerified; ///\n\n      break;\n    }\n\n    case TERM_RULE_NAME: {\n      const termNode = nonTerminalNode, ///\n            types = [],\n            context = fileContext,  ///\n            termVerified = verifyTerm(termNode, types, context);\n\n      if (termVerified) {\n        const firstType = first(types),\n              type = firstType; ///\n\n        if (type !== null) {\n          const termString = nodeAsString(termNode);\n\n          fileContext.error(`The type of the constructor's compound '${termString}' term node is not null.`);\n        } else {\n          nonTerminalNodeVerified = true; ///\n        }\n      }\n\n      break;\n    }\n\n    default: {\n      const childNodes = nonTerminalNode.getChildNodes(),\n            childNodesVerified = verifyChildNodes(childNodes, fileContext);\n\n      nonTerminalNodeVerified = childNodesVerified; ///\n\n      break;\n    }\n  }\n\n  return nonTerminalNodeVerified;\n}\n\n"],"names":["verifyTermAsConstructor","typeNodeQuery","nodeQuery","termNode","typeNode","fileContext","termVerifiedAsConstructor","begin","type","nonTerminalNode","termString","nodeAsString","debug","childNodes","getChildNodes","childNodesVerified","verifyChildNodes","typeName","typeNameFromTypeNode","findTypeByTypeName","error","constructor","Constructor","fromTermNodeAndType","addConstructor","info","complete","halt","verifyNode","node","nodeVerified","nodeTerminalNode","isTerminalNode","terminalNode","terminalNodeVerified","verifyTerminalNode","nonTerminalNodeVerified","verifyNonTerminalNode","every","childNode","verifyArgumentNode","argumentNode","typeNodeVerified","argumentString","typePresent","isTypePresentByTypeName","ruleName","getRuleName","ARGUMENT_RULE_NAME","argumentNodeVerified","TERM_RULE_NAME","types","context","termVerified","verifyTerm","firstType","first"],"mappings":"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"}

package/lib/verify/theorem.js

@@ -13,7 +13,6 @@ var _labels = /*#__PURE__*/ _interopRequireDefault(require("../verify/labels"));
 var _proof = /*#__PURE__*/ _interopRequireDefault(require("../context/proof"));
 var _unqualified = /*#__PURE__*/ _interopRequireDefault(require("../verify/statement/unqualified"));
 var _indicativeConditional = /*#__PURE__*/ _interopRequireDefault(require("../verify/indicativeConditional"));
-var _array = require("../utilities/array");
 var _string = require("../utilities/string");
 var _query = require("../utilities/query");
 function _interopRequireDefault(obj) {
@@ -21,7 +20,7 @@ function _interopRequireDefault(obj) {
         default: obj
     };
 }
-var labelNodesQuery = (0, _query.nodesQuery)("/theorem/label"), statementNodeQuery = (0, _query.nodeQuery)("/unqualifiedStatement/statement!"), statementNodesQuery = (0, _query.nodesQuery)("/indicativeConditional/unqualifiedStatement/statement!"), unqualifiedStatementNodeQuery = (0, _query.nodeQuery)("/theorem/unqualifiedStatement!"), indicativeConditionalNodeQuery = (0, _query.nodeQuery)("/theorem/indicativeConditional!");
+var labelNodesQuery = (0, _query.nodesQuery)("/theorem/label"), unqualifiedStatementNodeQuery = (0, _query.nodeQuery)("/theorem/unqualifiedStatement!"), indicativeConditionalNodeQuery = (0, _query.nodeQuery)("/theorem/indicativeConditional!");
 function verifyTheorem(theoremNode, fileContext) {
     var theoremVerified = false;
     fileContext.begin(theoremNode);
@@ -30,21 +29,17 @@ function verifyTheorem(theoremNode, fileContext) {
     var labels = [], labelsVerified = (0, _labels.default)(labelNodes, labels, fileContext);
     if (labelsVerified) {
         var unqualifiedStatementNode = unqualifiedStatementNodeQuery(theoremNode), indicativeConditionalNode = indicativeConditionalNodeQuery(theoremNode);
+        var unqualifiedStatementVerified = false, indicativeConditionalVerified = false;
         if (unqualifiedStatementNode !== null) {
-            var unqualifiedStatementVerified = (0, _unqualified.default)(unqualifiedStatementNode, proofContext);
-            if (unqualifiedStatementVerified) {
-                var statementNode = statementNodeQuery(unqualifiedStatementNode), theorem = _theorem.default.fromLabelsAndStatementNode(labels, statementNode);
-                fileContext.addTheorem(theorem);
-                theoremVerified = true;
-            }
+            unqualifiedStatementVerified = (0, _unqualified.default)(unqualifiedStatementNode, proofContext);
         }
         if (indicativeConditionalNode !== null) {
-            var indicativeConditionalVerified = (0, _indicativeConditional.default)(indicativeConditionalNode, proofContext);
-            if (indicativeConditionalVerified !== null) {
-                var statementNodes = statementNodesQuery(indicativeConditionalNode), lastStatementNode = (0, _array.last)(statementNodes), frontStatementNodes = (0, _array.front)(statementNodes), consequentStatementNode = lastStatementNode, suppositionStatementNodes = frontStatementNodes, theorem1 = _theorem.default.fromLabelsSuppositionStatementNodesAndConsequentStatementNode(labels, suppositionStatementNodes, consequentStatementNode);
-                fileContext.addTheorem(theorem1);
-                theoremVerified = true;
-            }
+            indicativeConditionalVerified = (0, _indicativeConditional.default)(indicativeConditionalNode, proofContext);
+        }
+        if (unqualifiedStatementVerified || indicativeConditionalVerified) {
+            var theorem = _theorem.default.fromLabelsUnqualifiedStatementNodeAndIndicativeConditionalNode(labels, unqualifiedStatementNode, indicativeConditionalNode);
+            fileContext.addTheorem(theorem);
+            theoremVerified = true;
         }
     }
     if (theoremVerified) {
@@ -54,4 +49,4 @@ function verifyTheorem(theoremNode, fileContext) {
     return theoremVerified;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdGhlb3JlbS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFRoZW9yZW0gZnJvbSBcIi4uL3RoZW9yZW1cIjtcbmltcG9ydCB2ZXJpZnlMYWJlbHMgZnJvbSBcIi4uL3ZlcmlmeS9sYWJlbHNcIjtcbmltcG9ydCBQcm9vZkNvbnRleHQgZnJvbSBcIi4uL2NvbnRleHQvcHJvb2ZcIjtcbmltcG9ydCB2ZXJpZnlVbnF1YWxpZmllZFN0YXRlbWVudCBmcm9tIFwiLi4vdmVyaWZ5L3N0YXRlbWVudC91bnF1YWxpZmllZFwiO1xuaW1wb3J0IHZlcmlmeUluZGljYXRpdmVDb25kaXRpb25hbCBmcm9tIFwiLi4vdmVyaWZ5L2luZGljYXRpdmVDb25kaXRpb25hbFwiO1xuXG5pbXBvcnQgeyBmcm9udCwgbGFzdCB9IGZyb20gXCIuLi91dGlsaXRpZXMvYXJyYXlcIjtcbmltcG9ydCB7IG5vZGVzQXNTdHJpbmcgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3N0cmluZ1wiO1xuaW1wb3J0IHsgbm9kZVF1ZXJ5LCBub2Rlc1F1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5jb25zdCBsYWJlbE5vZGVzUXVlcnkgPSBub2Rlc1F1ZXJ5KFwiL3RoZW9yZW0vbGFiZWxcIiksXG4gICAgICBzdGF0ZW1lbnROb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvdW5xdWFsaWZpZWRTdGF0ZW1lbnQvc3RhdGVtZW50IVwiKSxcbiAgICAgIHN0YXRlbWVudE5vZGVzUXVlcnkgPSBub2Rlc1F1ZXJ5KFwiL2luZGljYXRpdmVDb25kaXRpb25hbC91bnF1YWxpZmllZFN0YXRlbWVudC9zdGF0ZW1lbnQhXCIpLFxuICAgICAgdW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvdGhlb3JlbS91bnF1YWxpZmllZFN0YXRlbWVudCFcIiksXG4gICAgICBpbmRpY2F0aXZlQ29uZGl0aW9uYWxOb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvdGhlb3JlbS9pbmRpY2F0aXZlQ29uZGl0aW9uYWwhXCIpO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlUaGVvcmVtKHRoZW9yZW1Ob2RlLCBmaWxlQ29udGV4dCkge1xuICBsZXQgdGhlb3JlbVZlcmlmaWVkID0gZmFsc2U7XG5cbiAgZmlsZUNvbnRleHQuYmVnaW4odGhlb3JlbU5vZGUpO1xuXG4gIGNvbnN0IGxhYmVsTm9kZXMgPSBsYWJlbE5vZGVzUXVlcnkodGhlb3JlbU5vZGUpLFxuICAgICAgICBsYWJlbHNTdHJpbmcgPSBub2Rlc0FzU3RyaW5nKGxhYmVsTm9kZXMpLFxuICAgICAgICBwcm9vZkNvbnRleHQgPSBQcm9vZkNvbnRleHQuZnJvbUZpbGVDb250ZXh0KGZpbGVDb250ZXh0KTtcblxuICBmaWxlQ29udGV4dC5kZWJ1ZyhgVmVyaWZ5aW5nIHRoZSAnJHtsYWJlbHNTdHJpbmd9JyB0aGVvcmVtLi4uYCk7XG5cbiAgY29uc3QgbGFiZWxzID0gW10sXG4gICAgICAgIGxhYmVsc1ZlcmlmaWVkID0gdmVyaWZ5TGFiZWxzKGxhYmVsTm9kZXMsIGxhYmVscywgZmlsZUNvbnRleHQpO1xuXG4gIGlmIChsYWJlbHNWZXJpZmllZCkge1xuICAgIGNvbnN0IHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSA9IHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZVF1ZXJ5KHRoZW9yZW1Ob2RlKSxcbiAgICAgICAgICBpbmRpY2F0aXZlQ29uZGl0aW9uYWxOb2RlID0gaW5kaWNhdGl2ZUNvbmRpdGlvbmFsTm9kZVF1ZXJ5KHRoZW9yZW1Ob2RlKTtcblxuICAgIGlmICh1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUgIT09IG51bGwpIHtcbiAgICAgIGNvbnN0IHVucXVhbGlmaWVkU3RhdGVtZW50VmVyaWZpZWQgPSB2ZXJpZnlVbnF1YWxpZmllZFN0YXRlbWVudCh1bnF1YWxpZmllZFN0YXRlbWVudE5vZGUsIHByb29mQ29udGV4dCk7XG5cbiAgICAgIGlmICh1bnF1YWxpZmllZFN0YXRlbWVudFZlcmlmaWVkKSB7XG4gICAgICAgIGNvbnN0IHN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnROb2RlUXVlcnkodW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlKSxcbiAgICAgICAgICAgICAgdGhlb3JlbSA9IFRoZW9yZW0uZnJvbUxhYmVsc0FuZFN0YXRlbWVudE5vZGUobGFiZWxzLCBzdGF0ZW1lbnROb2RlKTtcblxuICAgICAgICBmaWxlQ29udGV4dC5hZGRUaGVvcmVtKHRoZW9yZW0pO1xuXG4gICAgICAgIHRoZW9yZW1WZXJpZmllZCA9IHRydWU7XG4gICAgICB9XG4gICAgfVxuXG4gICAgaWYgKGluZGljYXRpdmVDb25kaXRpb25hbE5vZGUgIT09IG51bGwpIHtcbiAgICAgIGNvbnN0IGluZGljYXRpdmVDb25kaXRpb25hbFZlcmlmaWVkID0gdmVyaWZ5SW5kaWNhdGl2ZUNvbmRpdGlvbmFsKGluZGljYXRpdmVDb25kaXRpb25hbE5vZGUsIHByb29mQ29udGV4dCk7XG5cbiAgICAgIGlmIChpbmRpY2F0aXZlQ29uZGl0aW9uYWxWZXJpZmllZCAhPT0gbnVsbCkge1xuICAgICAgICBjb25zdCBzdGF0ZW1lbnROb2RlcyA9IHN0YXRlbWVudE5vZGVzUXVlcnkoaW5kaWNhdGl2ZUNvbmRpdGlvbmFsTm9kZSksXG4gICAgICAgICAgICAgIGxhc3RTdGF0ZW1lbnROb2RlID0gbGFzdChzdGF0ZW1lbnROb2RlcyksXG4gICAgICAgICAgICAgIGZyb250U3RhdGVtZW50Tm9kZXMgPSBmcm9udChzdGF0ZW1lbnROb2RlcyksXG4gICAgICAgICAgICAgIGNvbnNlcXVlbnRTdGF0ZW1lbnROb2RlID0gbGFzdFN0YXRlbWVudE5vZGUsICAvLy9cbiAgICAgICAgICAgICAgc3VwcG9zaXRpb25TdGF0ZW1lbnROb2RlcyA9IGZyb250U3RhdGVtZW50Tm9kZXMsICAvLy9cbiAgICAgICAgICAgICAgdGhlb3JlbSA9IFRoZW9yZW0uZnJvbUxhYmVsc1N1cHBvc2l0aW9uU3RhdGVtZW50Tm9kZXNBbmRDb25zZXF1ZW50U3RhdGVtZW50Tm9kZShsYWJlbHMsIHN1cHBvc2l0aW9uU3RhdGVtZW50Tm9kZXMsIGNvbnNlcXVlbnRTdGF0ZW1lbnROb2RlKTtcblxuICAgICAgICBmaWxlQ29udGV4dC5hZGRUaGVvcmVtKHRoZW9yZW0pO1xuXG4gICAgICAgIHRoZW9yZW1WZXJpZmllZCA9IHRydWU7XG4gICAgICB9XG4gICAgfVxuICB9XG5cbiAgaWYgKHRoZW9yZW1WZXJpZmllZCkge1xuICAgIGZpbGVDb250ZXh0LmluZm8oYFZlcmlmaWVkIHRoZSAnJHtsYWJlbHNTdHJpbmd9JyB0aGVvcmVtLmApO1xuICB9XG5cbiAgdGhlb3JlbVZlcmlmaWVkID9cbiAgICBmaWxlQ29udGV4dC5jb21wbGV0ZSh0aGVvcmVtTm9kZSkgOlxuICAgICAgZmlsZUNvbnRleHQuaGFsdCh0aGVvcmVtTm9kZSk7XG5cbiAgcmV0dXJuIHRoZW9yZW1WZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlUaGVvcmVtIiwibGFiZWxOb2Rlc1F1ZXJ5Iiwibm9kZXNRdWVyeSIsInN0YXRlbWVudE5vZGVRdWVyeSIsIm5vZGVRdWVyeSIsInN0YXRlbWVudE5vZGVzUXVlcnkiLCJ1bnF1YWxpZmllZFN0YXRlbWVudE5vZGVRdWVyeSIsImluZGljYXRpdmVDb25kaXRpb25hbE5vZGVRdWVyeSIsInRoZW9yZW1Ob2RlIiwiZmlsZUNvbnRleHQiLCJ0aGVvcmVtVmVyaWZpZWQiLCJiZWdpbiIsImxhYmVsTm9kZXMiLCJsYWJlbHNTdHJpbmciLCJub2Rlc0FzU3RyaW5nIiwicHJvb2ZDb250ZXh0IiwiUHJvb2ZDb250ZXh0IiwiZnJvbUZpbGVDb250ZXh0IiwiZGVidWciLCJsYWJlbHMiLCJsYWJlbHNWZXJpZmllZCIsInZlcmlmeUxhYmVscyIsInVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSIsImluZGljYXRpdmVDb25kaXRpb25hbE5vZGUiLCJ1bnF1YWxpZmllZFN0YXRlbWVudFZlcmlmaWVkIiwidmVyaWZ5VW5xdWFsaWZpZWRTdGF0ZW1lbnQiLCJzdGF0ZW1lbnROb2RlIiwidGhlb3JlbSIsIlRoZW9yZW0iLCJmcm9tTGFiZWxzQW5kU3RhdGVtZW50Tm9kZSIsImFkZFRoZW9yZW0iLCJpbmRpY2F0aXZlQ29uZGl0aW9uYWxWZXJpZmllZCIsInZlcmlmeUluZGljYXRpdmVDb25kaXRpb25hbCIsInN0YXRlbWVudE5vZGVzIiwibGFzdFN0YXRlbWVudE5vZGUiLCJsYXN0IiwiZnJvbnRTdGF0ZW1lbnROb2RlcyIsImZyb250IiwiY29uc2VxdWVudFN0YXRlbWVudE5vZGUiLCJzdXBwb3NpdGlvblN0YXRlbWVudE5vZGVzIiwiZnJvbUxhYmVsc1N1cHBvc2l0aW9uU3RhdGVtZW50Tm9kZXNBbmRDb25zZXF1ZW50U3RhdGVtZW50Tm9kZSIsImluZm8iLCJjb21wbGV0ZSIsImhhbHQiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQWtCQTs7O2VBQXdCQTs7OzREQWhCSjsyREFDSzswREFDQTtnRUFDYzswRUFDQztxQkFFWjtzQkFDRTtxQkFDUTs7Ozs7O0FBRXRDLElBQU1DLGtCQUFrQkMsSUFBQUEsaUJBQVUsRUFBQyxtQkFDN0JDLHFCQUFxQkMsSUFBQUEsZ0JBQVMsRUFBQyxxQ0FDL0JDLHNCQUFzQkgsSUFBQUEsaUJBQVUsRUFBQywyREFDakNJLGdDQUFnQ0YsSUFBQUEsZ0JBQVMsRUFBQyxtQ0FDMUNHLGlDQUFpQ0gsSUFBQUEsZ0JBQVMsRUFBQztBQUVsQyxTQUFTSixjQUFjUSxXQUFXLEVBQUVDLFdBQVcsRUFBRTtJQUM5RCxJQUFJQyxrQkFBa0IsS0FBSztJQUUzQkQsWUFBWUUsS0FBSyxDQUFDSDtJQUVsQixJQUFNSSxhQUFhWCxnQkFBZ0JPLGNBQzdCSyxlQUFlQyxJQUFBQSxxQkFBYSxFQUFDRixhQUM3QkcsZUFBZUMsY0FBWSxDQUFDQyxlQUFlLENBQUNSO0lBRWxEQSxZQUFZUyxLQUFLLENBQUMsQUFBQyxrQkFBOEIsT0FBYkwsY0FBYTtJQUVqRCxJQUFNTSxTQUFTLEVBQUUsRUFDWEMsaUJBQWlCQyxJQUFBQSxlQUFZLEVBQUNULFlBQVlPLFFBQVFWO0lBRXhELElBQUlXLGdCQUFnQjtRQUNsQixJQUFNRSwyQkFBMkJoQiw4QkFBOEJFLGNBQ3pEZSw0QkFBNEJoQiwrQkFBK0JDO1FBRWpFLElBQUljLDZCQUE2QixJQUFJLEVBQUU7WUFDckMsSUFBTUUsK0JBQStCQyxJQUFBQSxvQkFBMEIsRUFBQ0gsMEJBQTBCUDtZQUUxRixJQUFJUyw4QkFBOEI7Z0JBQ2hDLElBQU1FLGdCQUFnQnZCLG1CQUFtQm1CLDJCQUNuQ0ssVUFBVUMsZ0JBQU8sQ0FBQ0MsMEJBQTBCLENBQUNWLFFBQVFPO2dCQUUzRGpCLFlBQVlxQixVQUFVLENBQUNIO2dCQUV2QmpCLGtCQUFrQixJQUFJO1lBQ3hCLENBQUM7UUFDSCxDQUFDO1FBRUQsSUFBSWEsOEJBQThCLElBQUksRUFBRTtZQUN0QyxJQUFNUSxnQ0FBZ0NDLElBQUFBLDhCQUEyQixFQUFDVCwyQkFBMkJSO1lBRTdGLElBQUlnQixrQ0FBa0MsSUFBSSxFQUFFO2dCQUMxQyxJQUFNRSxpQkFBaUI1QixvQkFBb0JrQiw0QkFDckNXLG9CQUFvQkMsSUFBQUEsV0FBSSxFQUFDRixpQkFDekJHLHNCQUFzQkMsSUFBQUEsWUFBSyxFQUFDSixpQkFDNUJLLDBCQUEwQkosbUJBQzFCSyw0QkFBNEJILHFCQUM1QlQsV0FBVUMsZ0JBQU8sQ0FBQ1ksNkRBQTZELENBQUNyQixRQUFRb0IsMkJBQTJCRDtnQkFFekg3QixZQUFZcUIsVUFBVSxDQUFDSDtnQkFFdkJqQixrQkFBa0IsSUFBSTtZQUN4QixDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7SUFFRCxJQUFJQSxpQkFBaUI7UUFDbkJELFlBQVlnQyxJQUFJLENBQUMsQUFBQyxpQkFBNkIsT0FBYjVCLGNBQWE7SUFDakQsQ0FBQztJQUVESCxrQkFDRUQsWUFBWWlDLFFBQVEsQ0FBQ2xDLGVBQ25CQyxZQUFZa0MsSUFBSSxDQUFDbkMsWUFBWTtJQUVqQyxPQUFPRTtBQUNUIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdGhlb3JlbS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFRoZW9yZW0gZnJvbSBcIi4uL3RoZW9yZW1cIjtcbmltcG9ydCB2ZXJpZnlMYWJlbHMgZnJvbSBcIi4uL3ZlcmlmeS9sYWJlbHNcIjtcbmltcG9ydCBQcm9vZkNvbnRleHQgZnJvbSBcIi4uL2NvbnRleHQvcHJvb2ZcIjtcbmltcG9ydCB2ZXJpZnlVbnF1YWxpZmllZFN0YXRlbWVudCBmcm9tIFwiLi4vdmVyaWZ5L3N0YXRlbWVudC91bnF1YWxpZmllZFwiO1xuaW1wb3J0IHZlcmlmeUluZGljYXRpdmVDb25kaXRpb25hbCBmcm9tIFwiLi4vdmVyaWZ5L2luZGljYXRpdmVDb25kaXRpb25hbFwiO1xuXG5pbXBvcnQgeyBub2Rlc0FzU3RyaW5nIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9zdHJpbmdcIjtcbmltcG9ydCB7IG5vZGVRdWVyeSwgbm9kZXNRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuY29uc3QgbGFiZWxOb2Rlc1F1ZXJ5ID0gbm9kZXNRdWVyeShcIi90aGVvcmVtL2xhYmVsXCIpLFxuICAgICAgdW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvdGhlb3JlbS91bnF1YWxpZmllZFN0YXRlbWVudCFcIiksXG4gICAgICBpbmRpY2F0aXZlQ29uZGl0aW9uYWxOb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvdGhlb3JlbS9pbmRpY2F0aXZlQ29uZGl0aW9uYWwhXCIpO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlUaGVvcmVtKHRoZW9yZW1Ob2RlLCBmaWxlQ29udGV4dCkge1xuICBsZXQgdGhlb3JlbVZlcmlmaWVkID0gZmFsc2U7XG5cbiAgZmlsZUNvbnRleHQuYmVnaW4odGhlb3JlbU5vZGUpO1xuXG4gIGNvbnN0IGxhYmVsTm9kZXMgPSBsYWJlbE5vZGVzUXVlcnkodGhlb3JlbU5vZGUpLFxuICAgICAgICBsYWJlbHNTdHJpbmcgPSBub2Rlc0FzU3RyaW5nKGxhYmVsTm9kZXMpLFxuICAgICAgICBwcm9vZkNvbnRleHQgPSBQcm9vZkNvbnRleHQuZnJvbUZpbGVDb250ZXh0KGZpbGVDb250ZXh0KTtcblxuICBmaWxlQ29udGV4dC5kZWJ1ZyhgVmVyaWZ5aW5nIHRoZSAnJHtsYWJlbHNTdHJpbmd9JyB0aGVvcmVtLi4uYCk7XG5cbiAgY29uc3QgbGFiZWxzID0gW10sXG4gICAgbGFiZWxzVmVyaWZpZWQgPSB2ZXJpZnlMYWJlbHMobGFiZWxOb2RlcywgbGFiZWxzLCBmaWxlQ29udGV4dCk7XG5cbiAgaWYgKGxhYmVsc1ZlcmlmaWVkKSB7XG4gICAgY29uc3QgdW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlID0gdW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlUXVlcnkodGhlb3JlbU5vZGUpLFxuICAgICAgICAgIGluZGljYXRpdmVDb25kaXRpb25hbE5vZGUgPSBpbmRpY2F0aXZlQ29uZGl0aW9uYWxOb2RlUXVlcnkodGhlb3JlbU5vZGUpO1xuXG4gICAgbGV0IHVucXVhbGlmaWVkU3RhdGVtZW50VmVyaWZpZWQgPSBmYWxzZSxcbiAgICAgIGluZGljYXRpdmVDb25kaXRpb25hbFZlcmlmaWVkID0gZmFsc2U7XG5cbiAgICBpZiAodW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlICE9PSBudWxsKSB7XG4gICAgICB1bnF1YWxpZmllZFN0YXRlbWVudFZlcmlmaWVkID0gdmVyaWZ5VW5xdWFsaWZpZWRTdGF0ZW1lbnQodW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlLCBwcm9vZkNvbnRleHQpO1xuICAgIH1cblxuICAgIGlmIChpbmRpY2F0aXZlQ29uZGl0aW9uYWxOb2RlICE9PSBudWxsKSB7XG4gICAgICBpbmRpY2F0aXZlQ29uZGl0aW9uYWxWZXJpZmllZCA9IHZlcmlmeUluZGljYXRpdmVDb25kaXRpb25hbChpbmRpY2F0aXZlQ29uZGl0aW9uYWxOb2RlLCBwcm9vZkNvbnRleHQpO1xuICAgIH1cblxuICAgIGlmICh1bnF1YWxpZmllZFN0YXRlbWVudFZlcmlmaWVkIHx8IGluZGljYXRpdmVDb25kaXRpb25hbFZlcmlmaWVkKSB7XG4gICAgICBjb25zdCB0aGVvcmVtID0gVGhlb3JlbS5mcm9tTGFiZWxzVW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlQW5kSW5kaWNhdGl2ZUNvbmRpdGlvbmFsTm9kZShsYWJlbHMsIHVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZSwgaW5kaWNhdGl2ZUNvbmRpdGlvbmFsTm9kZSk7XG5cbiAgICAgIGZpbGVDb250ZXh0LmFkZFRoZW9yZW0odGhlb3JlbSk7XG5cbiAgICAgIHRoZW9yZW1WZXJpZmllZCA9IHRydWU7XG4gICAgfVxuICB9XG5cbiAgaWYgKHRoZW9yZW1WZXJpZmllZCkge1xuICAgIGZpbGVDb250ZXh0LmluZm8oYFZlcmlmaWVkIHRoZSAnJHtsYWJlbHNTdHJpbmd9JyB0aGVvcmVtLmApO1xuICB9XG5cbiAgdGhlb3JlbVZlcmlmaWVkID9cbiAgICBmaWxlQ29udGV4dC5jb21wbGV0ZSh0aGVvcmVtTm9kZSkgOlxuICAgICAgZmlsZUNvbnRleHQuaGFsdCh0aGVvcmVtTm9kZSk7XG5cbiAgcmV0dXJuIHRoZW9yZW1WZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlUaGVvcmVtIiwibGFiZWxOb2Rlc1F1ZXJ5Iiwibm9kZXNRdWVyeSIsInVucXVhbGlmaWVkU3RhdGVtZW50Tm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5IiwiaW5kaWNhdGl2ZUNvbmRpdGlvbmFsTm9kZVF1ZXJ5IiwidGhlb3JlbU5vZGUiLCJmaWxlQ29udGV4dCIsInRoZW9yZW1WZXJpZmllZCIsImJlZ2luIiwibGFiZWxOb2RlcyIsImxhYmVsc1N0cmluZyIsIm5vZGVzQXNTdHJpbmciLCJwcm9vZkNvbnRleHQiLCJQcm9vZkNvbnRleHQiLCJmcm9tRmlsZUNvbnRleHQiLCJkZWJ1ZyIsImxhYmVscyIsImxhYmVsc1ZlcmlmaWVkIiwidmVyaWZ5TGFiZWxzIiwidW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlIiwiaW5kaWNhdGl2ZUNvbmRpdGlvbmFsTm9kZSIsInVucXVhbGlmaWVkU3RhdGVtZW50VmVyaWZpZWQiLCJpbmRpY2F0aXZlQ29uZGl0aW9uYWxWZXJpZmllZCIsInZlcmlmeVVucXVhbGlmaWVkU3RhdGVtZW50IiwidmVyaWZ5SW5kaWNhdGl2ZUNvbmRpdGlvbmFsIiwidGhlb3JlbSIsIlRoZW9yZW0iLCJmcm9tTGFiZWxzVW5xdWFsaWZpZWRTdGF0ZW1lbnROb2RlQW5kSW5kaWNhdGl2ZUNvbmRpdGlvbmFsTm9kZSIsImFkZFRoZW9yZW0iLCJpbmZvIiwiY29tcGxldGUiLCJoYWx0Il0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFlQTs7O2VBQXdCQTs7OzREQWJKOzJEQUNLOzBEQUNBO2dFQUNjOzBFQUNDO3NCQUVWO3FCQUNROzs7Ozs7QUFFdEMsSUFBTUMsa0JBQWtCQyxJQUFBQSxpQkFBVSxFQUFDLG1CQUM3QkMsZ0NBQWdDQyxJQUFBQSxnQkFBUyxFQUFDLG1DQUMxQ0MsaUNBQWlDRCxJQUFBQSxnQkFBUyxFQUFDO0FBRWxDLFNBQVNKLGNBQWNNLFdBQVcsRUFBRUMsV0FBVyxFQUFFO0lBQzlELElBQUlDLGtCQUFrQixLQUFLO0lBRTNCRCxZQUFZRSxLQUFLLENBQUNIO0lBRWxCLElBQU1JLGFBQWFULGdCQUFnQkssY0FDN0JLLGVBQWVDLElBQUFBLHFCQUFhLEVBQUNGLGFBQzdCRyxlQUFlQyxjQUFZLENBQUNDLGVBQWUsQ0FBQ1I7SUFFbERBLFlBQVlTLEtBQUssQ0FBQyxBQUFDLGtCQUE4QixPQUFiTCxjQUFhO0lBRWpELElBQU1NLFNBQVMsRUFBRSxFQUNmQyxpQkFBaUJDLElBQUFBLGVBQVksRUFBQ1QsWUFBWU8sUUFBUVY7SUFFcEQsSUFBSVcsZ0JBQWdCO1FBQ2xCLElBQU1FLDJCQUEyQmpCLDhCQUE4QkcsY0FDekRlLDRCQUE0QmhCLCtCQUErQkM7UUFFakUsSUFBSWdCLCtCQUErQixLQUFLLEVBQ3RDQyxnQ0FBZ0MsS0FBSztRQUV2QyxJQUFJSCw2QkFBNkIsSUFBSSxFQUFFO1lBQ3JDRSwrQkFBK0JFLElBQUFBLG9CQUEwQixFQUFDSiwwQkFBMEJQO1FBQ3RGLENBQUM7UUFFRCxJQUFJUSw4QkFBOEIsSUFBSSxFQUFFO1lBQ3RDRSxnQ0FBZ0NFLElBQUFBLDhCQUEyQixFQUFDSiwyQkFBMkJSO1FBQ3pGLENBQUM7UUFFRCxJQUFJUyxnQ0FBZ0NDLCtCQUErQjtZQUNqRSxJQUFNRyxVQUFVQyxnQkFBTyxDQUFDQyw4REFBOEQsQ0FBQ1gsUUFBUUcsMEJBQTBCQztZQUV6SGQsWUFBWXNCLFVBQVUsQ0FBQ0g7WUFFdkJsQixrQkFBa0IsSUFBSTtRQUN4QixDQUFDO0lBQ0gsQ0FBQztJQUVELElBQUlBLGlCQUFpQjtRQUNuQkQsWUFBWXVCLElBQUksQ0FBQyxBQUFDLGlCQUE2QixPQUFibkIsY0FBYTtJQUNqRCxDQUFDO0lBRURILGtCQUNFRCxZQUFZd0IsUUFBUSxDQUFDekIsZUFDbkJDLFlBQVl5QixJQUFJLENBQUMxQixZQUFZO0lBRWpDLE9BQU9FO0FBQ1QifQ==

package/lib/verify/type.js

@@ -19,11 +19,13 @@ function _interopRequireDefault(obj) {
 function verifyType(typeNode, superTypeNode, fileContext) {
     var typeVerified = false;
     fileContext.begin(typeNode);
-    var type = null;
+    var typeString = (0, _string.nodeAsString)(typeNode);
+    fileContext.debug("Verifying the '".concat(typeString, "' type..."));
     var typeName = (0, _query.typeNameFromTypeNode)(typeNode), typePresent = fileContext.isTypePresentByTypeName(typeName);
     if (typePresent) {
         fileContext.error("The type '".concat(typeName, "' is already present."));
     } else {
+        var type;
         var superTypeName = (0, _query.typeNameFromTypeNode)(superTypeNode);
         if (superTypeName === null) {
             type = _type.default.fromTypeName(typeName);
@@ -35,17 +37,16 @@ function verifyType(typeNode, superTypeNode, fileContext) {
                 type = _type.default.fromTypeNameAndSuperType(typeName, superType);
             }
         }
-    }
-    if (type !== null) {
-        fileContext.addType(type);
-        typeVerified = true;
+        if (type !== null) {
+            fileContext.addType(type);
+            typeVerified = true;
+        }
     }
     if (typeVerified) {
-        var typeString = (0, _string.nodeAsString)(typeNode);
         fileContext.info("Verified the '".concat(typeString, "' type."));
     }
     typeVerified ? fileContext.complete(typeNode) : fileContext.halt(typeNode);
     return typeVerified;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdHlwZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFR5cGUgZnJvbSBcIi4uL3R5cGVcIjtcblxuaW1wb3J0IHsgbm9kZUFzU3RyaW5nIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9zdHJpbmdcIjtcbmltcG9ydCB7IHR5cGVOYW1lRnJvbVR5cGVOb2RlIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlUeXBlKHR5cGVOb2RlLCBzdXBlclR5cGVOb2RlLCBmaWxlQ29udGV4dCkge1xuICBsZXQgdHlwZVZlcmlmaWVkID0gZmFsc2U7XG5cbiAgZmlsZUNvbnRleHQuYmVnaW4odHlwZU5vZGUpO1xuXG4gIGxldCB0eXBlID0gbnVsbDtcblxuICBjb25zdCB0eXBlTmFtZSA9IHR5cGVOYW1lRnJvbVR5cGVOb2RlKHR5cGVOb2RlKSxcbiAgICAgICAgdHlwZVByZXNlbnQgPSBmaWxlQ29udGV4dC5pc1R5cGVQcmVzZW50QnlUeXBlTmFtZSh0eXBlTmFtZSk7XG5cbiAgaWYgKHR5cGVQcmVzZW50KSB7XG4gICAgZmlsZUNvbnRleHQuZXJyb3IoYFRoZSB0eXBlICcke3R5cGVOYW1lfScgaXMgYWxyZWFkeSBwcmVzZW50LmApO1xuICB9IGVsc2Uge1xuICAgIGNvbnN0IHN1cGVyVHlwZU5hbWUgPSB0eXBlTmFtZUZyb21UeXBlTm9kZShzdXBlclR5cGVOb2RlKTtcblxuICAgIGlmIChzdXBlclR5cGVOYW1lID09PSBudWxsKSB7XG4gICAgICB0eXBlID0gVHlwZS5mcm9tVHlwZU5hbWUodHlwZU5hbWUpO1xuICAgIH0gZWxzZSB7XG4gICAgICBjb25zdCBzdXBlclR5cGUgPSBmaWxlQ29udGV4dC5maW5kVHlwZUJ5VHlwZU5hbWUoc3VwZXJUeXBlTmFtZSk7XG5cbiAgICAgIGlmIChzdXBlclR5cGUgPT09IG51bGwpIHtcbiAgICAgICAgZmlsZUNvbnRleHQuZXJyb3IoYFRoZSBzdXBlci10eXBlICcke3N1cGVyVHlwZU5hbWV9JyBpcyBtaXNzaW5nLmApO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgdHlwZSA9IFR5cGUuZnJvbVR5cGVOYW1lQW5kU3VwZXJUeXBlKHR5cGVOYW1lLCBzdXBlclR5cGUpO1xuICAgICAgfVxuICAgIH1cbiAgfVxuXG4gIGlmICh0eXBlICE9PSBudWxsKSB7XG4gICAgZmlsZUNvbnRleHQuYWRkVHlwZSh0eXBlKTtcblxuICAgIHR5cGVWZXJpZmllZCA9IHRydWU7XG4gIH1cblxuICBpZiAodHlwZVZlcmlmaWVkKSB7XG4gICAgY29uc3QgdHlwZVN0cmluZyA9IG5vZGVBc1N0cmluZyh0eXBlTm9kZSk7XG5cbiAgICBmaWxlQ29udGV4dC5pbmZvKGBWZXJpZmllZCB0aGUgJyR7dHlwZVN0cmluZ30nIHR5cGUuYCk7XG4gIH1cblxuICB0eXBlVmVyaWZpZWQgP1xuICAgIGZpbGVDb250ZXh0LmNvbXBsZXRlKHR5cGVOb2RlKTpcbiAgICAgIGZpbGVDb250ZXh0LmhhbHQodHlwZU5vZGUpO1xuXG4gIHJldHVybiB0eXBlVmVyaWZpZWQ7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5VHlwZSIsInR5cGVOb2RlIiwic3VwZXJUeXBlTm9kZSIsImZpbGVDb250ZXh0IiwidHlwZVZlcmlmaWVkIiwiYmVnaW4iLCJ0eXBlIiwidHlwZU5hbWUiLCJ0eXBlTmFtZUZyb21UeXBlTm9kZSIsInR5cGVQcmVzZW50IiwiaXNUeXBlUHJlc2VudEJ5VHlwZU5hbWUiLCJlcnJvciIsInN1cGVyVHlwZU5hbWUiLCJUeXBlIiwiZnJvbVR5cGVOYW1lIiwic3VwZXJUeXBlIiwiZmluZFR5cGVCeVR5cGVOYW1lIiwiZnJvbVR5cGVOYW1lQW5kU3VwZXJUeXBlIiwiYWRkVHlwZSIsInR5cGVTdHJpbmciLCJub2RlQXNTdHJpbmciLCJpbmZvIiwiY29tcGxldGUiLCJoYWx0Il0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFPQTs7O2VBQXdCQTs7O3lEQUxQO3NCQUVZO3FCQUNROzs7Ozs7QUFFdEIsU0FBU0EsV0FBV0MsUUFBUSxFQUFFQyxhQUFhLEVBQUVDLFdBQVcsRUFBRTtJQUN2RSxJQUFJQyxlQUFlLEtBQUs7SUFFeEJELFlBQVlFLEtBQUssQ0FBQ0o7SUFFbEIsSUFBSUssT0FBTyxJQUFJO0lBRWYsSUFBTUMsV0FBV0MsSUFBQUEsMkJBQW9CLEVBQUNQLFdBQ2hDUSxjQUFjTixZQUFZTyx1QkFBdUIsQ0FBQ0g7SUFFeEQsSUFBSUUsYUFBYTtRQUNmTixZQUFZUSxLQUFLLENBQUMsQUFBQyxhQUFxQixPQUFUSixVQUFTO0lBQzFDLE9BQU87UUFDTCxJQUFNSyxnQkFBZ0JKLElBQUFBLDJCQUFvQixFQUFDTjtRQUUzQyxJQUFJVSxrQkFBa0IsSUFBSSxFQUFFO1lBQzFCTixPQUFPTyxhQUFJLENBQUNDLFlBQVksQ0FBQ1A7UUFDM0IsT0FBTztZQUNMLElBQU1RLFlBQVlaLFlBQVlhLGtCQUFrQixDQUFDSjtZQUVqRCxJQUFJRyxjQUFjLElBQUksRUFBRTtnQkFDdEJaLFlBQVlRLEtBQUssQ0FBQyxBQUFDLG1CQUFnQyxPQUFkQyxlQUFjO1lBQ3JELE9BQU87Z0JBQ0xOLE9BQU9PLGFBQUksQ0FBQ0ksd0JBQXdCLENBQUNWLFVBQVVRO1lBQ2pELENBQUM7UUFDSCxDQUFDO0lBQ0gsQ0FBQztJQUVELElBQUlULFNBQVMsSUFBSSxFQUFFO1FBQ2pCSCxZQUFZZSxPQUFPLENBQUNaO1FBRXBCRixlQUFlLElBQUk7SUFDckIsQ0FBQztJQUVELElBQUlBLGNBQWM7UUFDaEIsSUFBTWUsYUFBYUMsSUFBQUEsb0JBQVksRUFBQ25CO1FBRWhDRSxZQUFZa0IsSUFBSSxDQUFDLEFBQUMsaUJBQTJCLE9BQVhGLFlBQVc7SUFDL0MsQ0FBQztJQUVEZixlQUNFRCxZQUFZbUIsUUFBUSxDQUFDckIsWUFDbkJFLFlBQVlvQixJQUFJLENBQUN0QixTQUFTO0lBRTlCLE9BQU9HO0FBQ1QifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdHlwZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFR5cGUgZnJvbSBcIi4uL3R5cGVcIjtcblxuaW1wb3J0IHsgbm9kZUFzU3RyaW5nIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9zdHJpbmdcIjtcbmltcG9ydCB7IHR5cGVOYW1lRnJvbVR5cGVOb2RlIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlUeXBlKHR5cGVOb2RlLCBzdXBlclR5cGVOb2RlLCBmaWxlQ29udGV4dCkge1xuICBsZXQgdHlwZVZlcmlmaWVkID0gZmFsc2U7XG5cbiAgZmlsZUNvbnRleHQuYmVnaW4odHlwZU5vZGUpO1xuXG4gIGNvbnN0IHR5cGVTdHJpbmcgPSBub2RlQXNTdHJpbmcodHlwZU5vZGUpO1xuXG4gIGZpbGVDb250ZXh0LmRlYnVnKGBWZXJpZnlpbmcgdGhlICcke3R5cGVTdHJpbmd9JyB0eXBlLi4uYCk7XG5cbiAgY29uc3QgdHlwZU5hbWUgPSB0eXBlTmFtZUZyb21UeXBlTm9kZSh0eXBlTm9kZSksXG4gICAgICAgIHR5cGVQcmVzZW50ID0gZmlsZUNvbnRleHQuaXNUeXBlUHJlc2VudEJ5VHlwZU5hbWUodHlwZU5hbWUpO1xuXG4gIGlmICh0eXBlUHJlc2VudCkge1xuICAgIGZpbGVDb250ZXh0LmVycm9yKGBUaGUgdHlwZSAnJHt0eXBlTmFtZX0nIGlzIGFscmVhZHkgcHJlc2VudC5gKTtcbiAgfSBlbHNlIHtcbiAgICBsZXQgdHlwZTtcblxuICAgIGNvbnN0IHN1cGVyVHlwZU5hbWUgPSB0eXBlTmFtZUZyb21UeXBlTm9kZShzdXBlclR5cGVOb2RlKTtcblxuICAgIGlmIChzdXBlclR5cGVOYW1lID09PSBudWxsKSB7XG4gICAgICB0eXBlID0gVHlwZS5mcm9tVHlwZU5hbWUodHlwZU5hbWUpO1xuICAgIH0gZWxzZSB7XG4gICAgICBjb25zdCBzdXBlclR5cGUgPSBmaWxlQ29udGV4dC5maW5kVHlwZUJ5VHlwZU5hbWUoc3VwZXJUeXBlTmFtZSk7XG5cbiAgICAgIGlmIChzdXBlclR5cGUgPT09IG51bGwpIHtcbiAgICAgICAgZmlsZUNvbnRleHQuZXJyb3IoYFRoZSBzdXBlci10eXBlICcke3N1cGVyVHlwZU5hbWV9JyBpcyBtaXNzaW5nLmApO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgdHlwZSA9IFR5cGUuZnJvbVR5cGVOYW1lQW5kU3VwZXJUeXBlKHR5cGVOYW1lLCBzdXBlclR5cGUpO1xuICAgICAgfVxuICAgIH1cblxuICAgIGlmICh0eXBlICE9PSBudWxsKSB7XG4gICAgICBmaWxlQ29udGV4dC5hZGRUeXBlKHR5cGUpO1xuXG4gICAgICB0eXBlVmVyaWZpZWQgPSB0cnVlO1xuICAgIH1cbiAgfVxuXG4gIGlmICh0eXBlVmVyaWZpZWQpIHtcbiAgICBmaWxlQ29udGV4dC5pbmZvKGBWZXJpZmllZCB0aGUgJyR7dHlwZVN0cmluZ30nIHR5cGUuYCk7XG4gIH1cblxuICB0eXBlVmVyaWZpZWQgP1xuICAgIGZpbGVDb250ZXh0LmNvbXBsZXRlKHR5cGVOb2RlKTpcbiAgICAgIGZpbGVDb250ZXh0LmhhbHQodHlwZU5vZGUpO1xuXG4gIHJldHVybiB0eXBlVmVyaWZpZWQ7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5VHlwZSIsInR5cGVOb2RlIiwic3VwZXJUeXBlTm9kZSIsImZpbGVDb250ZXh0IiwidHlwZVZlcmlmaWVkIiwiYmVnaW4iLCJ0eXBlU3RyaW5nIiwibm9kZUFzU3RyaW5nIiwiZGVidWciLCJ0eXBlTmFtZSIsInR5cGVOYW1lRnJvbVR5cGVOb2RlIiwidHlwZVByZXNlbnQiLCJpc1R5cGVQcmVzZW50QnlUeXBlTmFtZSIsImVycm9yIiwidHlwZSIsInN1cGVyVHlwZU5hbWUiLCJUeXBlIiwiZnJvbVR5cGVOYW1lIiwic3VwZXJUeXBlIiwiZmluZFR5cGVCeVR5cGVOYW1lIiwiZnJvbVR5cGVOYW1lQW5kU3VwZXJUeXBlIiwiYWRkVHlwZSIsImluZm8iLCJjb21wbGV0ZSIsImhhbHQiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQU9BOzs7ZUFBd0JBOzs7eURBTFA7c0JBRVk7cUJBQ1E7Ozs7OztBQUV0QixTQUFTQSxXQUFXQyxRQUFRLEVBQUVDLGFBQWEsRUFBRUMsV0FBVyxFQUFFO0lBQ3ZFLElBQUlDLGVBQWUsS0FBSztJQUV4QkQsWUFBWUUsS0FBSyxDQUFDSjtJQUVsQixJQUFNSyxhQUFhQyxJQUFBQSxvQkFBWSxFQUFDTjtJQUVoQ0UsWUFBWUssS0FBSyxDQUFDLEFBQUMsa0JBQTRCLE9BQVhGLFlBQVc7SUFFL0MsSUFBTUcsV0FBV0MsSUFBQUEsMkJBQW9CLEVBQUNULFdBQ2hDVSxjQUFjUixZQUFZUyx1QkFBdUIsQ0FBQ0g7SUFFeEQsSUFBSUUsYUFBYTtRQUNmUixZQUFZVSxLQUFLLENBQUMsQUFBQyxhQUFxQixPQUFUSixVQUFTO0lBQzFDLE9BQU87UUFDTCxJQUFJSztRQUVKLElBQU1DLGdCQUFnQkwsSUFBQUEsMkJBQW9CLEVBQUNSO1FBRTNDLElBQUlhLGtCQUFrQixJQUFJLEVBQUU7WUFDMUJELE9BQU9FLGFBQUksQ0FBQ0MsWUFBWSxDQUFDUjtRQUMzQixPQUFPO1lBQ0wsSUFBTVMsWUFBWWYsWUFBWWdCLGtCQUFrQixDQUFDSjtZQUVqRCxJQUFJRyxjQUFjLElBQUksRUFBRTtnQkFDdEJmLFlBQVlVLEtBQUssQ0FBQyxBQUFDLG1CQUFnQyxPQUFkRSxlQUFjO1lBQ3JELE9BQU87Z0JBQ0xELE9BQU9FLGFBQUksQ0FBQ0ksd0JBQXdCLENBQUNYLFVBQVVTO1lBQ2pELENBQUM7UUFDSCxDQUFDO1FBRUQsSUFBSUosU0FBUyxJQUFJLEVBQUU7WUFDakJYLFlBQVlrQixPQUFPLENBQUNQO1lBRXBCVixlQUFlLElBQUk7UUFDckIsQ0FBQztJQUNILENBQUM7SUFFRCxJQUFJQSxjQUFjO1FBQ2hCRCxZQUFZbUIsSUFBSSxDQUFDLEFBQUMsaUJBQTJCLE9BQVhoQixZQUFXO0lBQy9DLENBQUM7SUFFREYsZUFDRUQsWUFBWW9CLFFBQVEsQ0FBQ3RCLFlBQ25CRSxZQUFZcUIsSUFBSSxDQUFDdkIsU0FBUztJQUU5QixPQUFPRztBQUNUIn0=

package/lib/verify/variable.js

@@ -19,11 +19,13 @@ function _interopRequireDefault(obj) {
 function verifyVariable(variableNode, typeNode, fileContext) {
     var variableVerified = false;
     fileContext.begin(variableNode);
-    var variable = null;
+    var variableString = (0, _string.nodeAsString)(variableNode);
+    fileContext.debug("Verifying the '".concat(variableString, "' variable..."));
     var variableName = (0, _query.variableNameFromVariableNode)(variableNode), variablePresent = fileContext.isVariablePresentByVariableName(variableName);
     if (variablePresent) {
         fileContext.error("The variable '".concat(variableName, "' is already present."));
     } else {
+        var variable;
         var typeName = (0, _query.typeNameFromTypeNode)(typeNode);
         if (typeName === null) {
             var type = null, name = variableName; ///
@@ -43,11 +45,10 @@ function verifyVariable(variableNode, typeNode, fileContext) {
         }
     }
     if (variableVerified) {
-        var variableString = (0, _string.nodeAsString)(variableNode);
         fileContext.info("Verified the '".concat(variableString, "' variable."));
     }
     variableVerified ? fileContext.complete(variableNode) : fileContext.halt(variableNode);
     return variableVerified;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdmFyaWFibGUuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBWYXJpYWJsZSBmcm9tIFwiLi4vdmFyaWFibGVcIjtcblxuaW1wb3J0IHsgbm9kZUFzU3RyaW5nIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9zdHJpbmdcIjtcbmltcG9ydCB7IHR5cGVOYW1lRnJvbVR5cGVOb2RlLCB2YXJpYWJsZU5hbWVGcm9tVmFyaWFibGVOb2RlIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlWYXJpYWJsZSh2YXJpYWJsZU5vZGUsIHR5cGVOb2RlLCBmaWxlQ29udGV4dCkge1xuICBsZXQgdmFyaWFibGVWZXJpZmllZCA9IGZhbHNlO1xuXG4gIGZpbGVDb250ZXh0LmJlZ2luKHZhcmlhYmxlTm9kZSk7XG5cbiAgbGV0IHZhcmlhYmxlID0gbnVsbDtcblxuICBjb25zdCB2YXJpYWJsZU5hbWUgPSB2YXJpYWJsZU5hbWVGcm9tVmFyaWFibGVOb2RlKHZhcmlhYmxlTm9kZSksXG4gICAgICAgIHZhcmlhYmxlUHJlc2VudCA9IGZpbGVDb250ZXh0LmlzVmFyaWFibGVQcmVzZW50QnlWYXJpYWJsZU5hbWUodmFyaWFibGVOYW1lKTtcblxuICBpZiAodmFyaWFibGVQcmVzZW50KSB7XG4gICAgZmlsZUNvbnRleHQuZXJyb3IoYFRoZSB2YXJpYWJsZSAnJHt2YXJpYWJsZU5hbWV9JyBpcyBhbHJlYWR5IHByZXNlbnQuYCk7XG4gIH0gZWxzZSB7XG4gICAgY29uc3QgdHlwZU5hbWUgPSB0eXBlTmFtZUZyb21UeXBlTm9kZSh0eXBlTm9kZSk7XG4gICAgXG4gICAgaWYgKHR5cGVOYW1lID09PSBudWxsKSB7XG4gICAgICBjb25zdCB0eXBlID0gbnVsbCxcbiAgICAgICAgICAgIG5hbWUgPSB2YXJpYWJsZU5hbWU7ICAvLy9cblxuICAgICAgdmFyaWFibGUgPSBWYXJpYWJsZS5mcm9tVHlwZUFuZE5hbWUodHlwZSwgbmFtZSk7XG4gICAgfSBlbHNlIHtcbiAgICAgIGNvbnN0IHR5cGUgPSBmaWxlQ29udGV4dC5maW5kVHlwZUJ5VHlwZU5hbWUodHlwZU5hbWUpO1xuXG4gICAgICBpZiAodHlwZSA9PT0gbnVsbCkge1xuICAgICAgICBmaWxlQ29udGV4dC5lcnJvcihgVGhlICcke3ZhcmlhYmxlTmFtZX0nIHZhcmlhYmxlJ3MgJyR7dHlwZU5hbWV9JyB0eXBlIGlzIG1pc3NpbmcuYCk7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICBjb25zdCBuYW1lID0gdmFyaWFibGVOYW1lOyAgLy8vXG5cbiAgICAgICAgdmFyaWFibGUgPSBWYXJpYWJsZS5mcm9tVHlwZUFuZE5hbWUodHlwZSwgbmFtZSk7XG4gICAgICB9XG4gICAgfVxuXG4gICAgaWYgKHZhcmlhYmxlICE9PSBudWxsKSB7XG4gICAgICBmaWxlQ29udGV4dC5hZGRWYXJpYWJsZSh2YXJpYWJsZSk7XG5cbiAgICAgIHZhcmlhYmxlVmVyaWZpZWQgPSB0cnVlO1xuICAgIH1cbiAgfVxuXG4gIGlmICh2YXJpYWJsZVZlcmlmaWVkKSB7XG4gICAgY29uc3QgdmFyaWFibGVTdHJpbmcgPSBub2RlQXNTdHJpbmcodmFyaWFibGVOb2RlKTtcblxuICAgIGZpbGVDb250ZXh0LmluZm8oYFZlcmlmaWVkIHRoZSAnJHt2YXJpYWJsZVN0cmluZ30nIHZhcmlhYmxlLmApO1xuICB9XG5cbiAgdmFyaWFibGVWZXJpZmllZCA/XG4gICAgZmlsZUNvbnRleHQuY29tcGxldGUodmFyaWFibGVOb2RlKSA6XG4gICAgICBmaWxlQ29udGV4dC5oYWx0KHZhcmlhYmxlTm9kZSk7XG5cbiAgcmV0dXJuIHZhcmlhYmxlVmVyaWZpZWQ7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5VmFyaWFibGUiLCJ2YXJpYWJsZU5vZGUiLCJ0eXBlTm9kZSIsImZpbGVDb250ZXh0IiwidmFyaWFibGVWZXJpZmllZCIsImJlZ2luIiwidmFyaWFibGUiLCJ2YXJpYWJsZU5hbWUiLCJ2YXJpYWJsZU5hbWVGcm9tVmFyaWFibGVOb2RlIiwidmFyaWFibGVQcmVzZW50IiwiaXNWYXJpYWJsZVByZXNlbnRCeVZhcmlhYmxlTmFtZSIsImVycm9yIiwidHlwZU5hbWUiLCJ0eXBlTmFtZUZyb21UeXBlTm9kZSIsInR5cGUiLCJuYW1lIiwiVmFyaWFibGUiLCJmcm9tVHlwZUFuZE5hbWUiLCJmaW5kVHlwZUJ5VHlwZU5hbWUiLCJhZGRWYXJpYWJsZSIsInZhcmlhYmxlU3RyaW5nIiwibm9kZUFzU3RyaW5nIiwiaW5mbyIsImNvbXBsZXRlIiwiaGFsdCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBT0E7OztlQUF3QkE7Ozs2REFMSDtzQkFFUTtxQkFDc0M7Ozs7OztBQUVwRCxTQUFTQSxlQUFlQyxZQUFZLEVBQUVDLFFBQVEsRUFBRUMsV0FBVyxFQUFFO0lBQzFFLElBQUlDLG1CQUFtQixLQUFLO0lBRTVCRCxZQUFZRSxLQUFLLENBQUNKO0lBRWxCLElBQUlLLFdBQVcsSUFBSTtJQUVuQixJQUFNQyxlQUFlQyxJQUFBQSxtQ0FBNEIsRUFBQ1AsZUFDNUNRLGtCQUFrQk4sWUFBWU8sK0JBQStCLENBQUNIO0lBRXBFLElBQUlFLGlCQUFpQjtRQUNuQk4sWUFBWVEsS0FBSyxDQUFDLEFBQUMsaUJBQTZCLE9BQWJKLGNBQWE7SUFDbEQsT0FBTztRQUNMLElBQU1LLFdBQVdDLElBQUFBLDJCQUFvQixFQUFDWDtRQUV0QyxJQUFJVSxhQUFhLElBQUksRUFBRTtZQUNyQixJQUFNRSxPQUFPLElBQUksRUFDWEMsT0FBT1IsY0FBZSxHQUFHO1lBRS9CRCxXQUFXVSxpQkFBUSxDQUFDQyxlQUFlLENBQUNILE1BQU1DO1FBQzVDLE9BQU87WUFDTCxJQUFNRCxRQUFPWCxZQUFZZSxrQkFBa0IsQ0FBQ047WUFFNUMsSUFBSUUsVUFBUyxJQUFJLEVBQUU7Z0JBQ2pCWCxZQUFZUSxLQUFLLENBQUMsQUFBQyxRQUFvQ0MsT0FBN0JMLGNBQWEsa0JBQXlCLE9BQVRLLFVBQVM7WUFDbEUsT0FBTztnQkFDTCxJQUFNRyxRQUFPUixjQUFlLEdBQUc7Z0JBRS9CRCxXQUFXVSxpQkFBUSxDQUFDQyxlQUFlLENBQUNILE9BQU1DO1lBQzVDLENBQUM7UUFDSCxDQUFDO1FBRUQsSUFBSVQsYUFBYSxJQUFJLEVBQUU7WUFDckJILFlBQVlnQixXQUFXLENBQUNiO1lBRXhCRixtQkFBbUIsSUFBSTtRQUN6QixDQUFDO0lBQ0gsQ0FBQztJQUVELElBQUlBLGtCQUFrQjtRQUNwQixJQUFNZ0IsaUJBQWlCQyxJQUFBQSxvQkFBWSxFQUFDcEI7UUFFcENFLFlBQVltQixJQUFJLENBQUMsQUFBQyxpQkFBK0IsT0FBZkYsZ0JBQWU7SUFDbkQsQ0FBQztJQUVEaEIsbUJBQ0VELFlBQVlvQixRQUFRLENBQUN0QixnQkFDbkJFLFlBQVlxQixJQUFJLENBQUN2QixhQUFhO0lBRWxDLE9BQU9HO0FBQ1QifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdmFyaWFibGUuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBWYXJpYWJsZSBmcm9tIFwiLi4vdmFyaWFibGVcIjtcblxuaW1wb3J0IHsgbm9kZUFzU3RyaW5nIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9zdHJpbmdcIjtcbmltcG9ydCB7IHR5cGVOYW1lRnJvbVR5cGVOb2RlLCB2YXJpYWJsZU5hbWVGcm9tVmFyaWFibGVOb2RlIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlWYXJpYWJsZSh2YXJpYWJsZU5vZGUsIHR5cGVOb2RlLCBmaWxlQ29udGV4dCkge1xuICBsZXQgdmFyaWFibGVWZXJpZmllZCA9IGZhbHNlO1xuXG4gIGZpbGVDb250ZXh0LmJlZ2luKHZhcmlhYmxlTm9kZSk7XG5cbiAgY29uc3QgdmFyaWFibGVTdHJpbmcgPSBub2RlQXNTdHJpbmcodmFyaWFibGVOb2RlKTtcblxuICBmaWxlQ29udGV4dC5kZWJ1ZyhgVmVyaWZ5aW5nIHRoZSAnJHt2YXJpYWJsZVN0cmluZ30nIHZhcmlhYmxlLi4uYCk7XG5cbiAgY29uc3QgdmFyaWFibGVOYW1lID0gdmFyaWFibGVOYW1lRnJvbVZhcmlhYmxlTm9kZSh2YXJpYWJsZU5vZGUpLFxuICAgICAgICB2YXJpYWJsZVByZXNlbnQgPSBmaWxlQ29udGV4dC5pc1ZhcmlhYmxlUHJlc2VudEJ5VmFyaWFibGVOYW1lKHZhcmlhYmxlTmFtZSk7XG5cbiAgaWYgKHZhcmlhYmxlUHJlc2VudCkge1xuICAgIGZpbGVDb250ZXh0LmVycm9yKGBUaGUgdmFyaWFibGUgJyR7dmFyaWFibGVOYW1lfScgaXMgYWxyZWFkeSBwcmVzZW50LmApO1xuICB9IGVsc2Uge1xuICAgIGxldCB2YXJpYWJsZTtcblxuICAgIGNvbnN0IHR5cGVOYW1lID0gdHlwZU5hbWVGcm9tVHlwZU5vZGUodHlwZU5vZGUpO1xuICAgIFxuICAgIGlmICh0eXBlTmFtZSA9PT0gbnVsbCkge1xuICAgICAgY29uc3QgdHlwZSA9IG51bGwsXG4gICAgICAgICAgICBuYW1lID0gdmFyaWFibGVOYW1lOyAgLy8vXG5cbiAgICAgIHZhcmlhYmxlID0gVmFyaWFibGUuZnJvbVR5cGVBbmROYW1lKHR5cGUsIG5hbWUpO1xuICAgIH0gZWxzZSB7XG4gICAgICBjb25zdCB0eXBlID0gZmlsZUNvbnRleHQuZmluZFR5cGVCeVR5cGVOYW1lKHR5cGVOYW1lKTtcblxuICAgICAgaWYgKHR5cGUgPT09IG51bGwpIHtcbiAgICAgICAgZmlsZUNvbnRleHQuZXJyb3IoYFRoZSAnJHt2YXJpYWJsZU5hbWV9JyB2YXJpYWJsZSdzICcke3R5cGVOYW1lfScgdHlwZSBpcyBtaXNzaW5nLmApO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgY29uc3QgbmFtZSA9IHZhcmlhYmxlTmFtZTsgIC8vL1xuXG4gICAgICAgIHZhcmlhYmxlID0gVmFyaWFibGUuZnJvbVR5cGVBbmROYW1lKHR5cGUsIG5hbWUpO1xuICAgICAgfVxuICAgIH1cblxuICAgIGlmICh2YXJpYWJsZSAhPT0gbnVsbCkge1xuICAgICAgZmlsZUNvbnRleHQuYWRkVmFyaWFibGUodmFyaWFibGUpO1xuXG4gICAgICB2YXJpYWJsZVZlcmlmaWVkID0gdHJ1ZTtcbiAgICB9XG4gIH1cblxuICBpZiAodmFyaWFibGVWZXJpZmllZCkge1xuICAgIGZpbGVDb250ZXh0LmluZm8oYFZlcmlmaWVkIHRoZSAnJHt2YXJpYWJsZVN0cmluZ30nIHZhcmlhYmxlLmApO1xuICB9XG5cbiAgdmFyaWFibGVWZXJpZmllZCA/XG4gICAgZmlsZUNvbnRleHQuY29tcGxldGUodmFyaWFibGVOb2RlKSA6XG4gICAgICBmaWxlQ29udGV4dC5oYWx0KHZhcmlhYmxlTm9kZSk7XG5cbiAgcmV0dXJuIHZhcmlhYmxlVmVyaWZpZWQ7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5VmFyaWFibGUiLCJ2YXJpYWJsZU5vZGUiLCJ0eXBlTm9kZSIsImZpbGVDb250ZXh0IiwidmFyaWFibGVWZXJpZmllZCIsImJlZ2luIiwidmFyaWFibGVTdHJpbmciLCJub2RlQXNTdHJpbmciLCJkZWJ1ZyIsInZhcmlhYmxlTmFtZSIsInZhcmlhYmxlTmFtZUZyb21WYXJpYWJsZU5vZGUiLCJ2YXJpYWJsZVByZXNlbnQiLCJpc1ZhcmlhYmxlUHJlc2VudEJ5VmFyaWFibGVOYW1lIiwiZXJyb3IiLCJ2YXJpYWJsZSIsInR5cGVOYW1lIiwidHlwZU5hbWVGcm9tVHlwZU5vZGUiLCJ0eXBlIiwibmFtZSIsIlZhcmlhYmxlIiwiZnJvbVR5cGVBbmROYW1lIiwiZmluZFR5cGVCeVR5cGVOYW1lIiwiYWRkVmFyaWFibGUiLCJpbmZvIiwiY29tcGxldGUiLCJoYWx0Il0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFPQTs7O2VBQXdCQTs7OzZEQUxIO3NCQUVRO3FCQUNzQzs7Ozs7O0FBRXBELFNBQVNBLGVBQWVDLFlBQVksRUFBRUMsUUFBUSxFQUFFQyxXQUFXLEVBQUU7SUFDMUUsSUFBSUMsbUJBQW1CLEtBQUs7SUFFNUJELFlBQVlFLEtBQUssQ0FBQ0o7SUFFbEIsSUFBTUssaUJBQWlCQyxJQUFBQSxvQkFBWSxFQUFDTjtJQUVwQ0UsWUFBWUssS0FBSyxDQUFDLEFBQUMsa0JBQWdDLE9BQWZGLGdCQUFlO0lBRW5ELElBQU1HLGVBQWVDLElBQUFBLG1DQUE0QixFQUFDVCxlQUM1Q1Usa0JBQWtCUixZQUFZUywrQkFBK0IsQ0FBQ0g7SUFFcEUsSUFBSUUsaUJBQWlCO1FBQ25CUixZQUFZVSxLQUFLLENBQUMsQUFBQyxpQkFBNkIsT0FBYkosY0FBYTtJQUNsRCxPQUFPO1FBQ0wsSUFBSUs7UUFFSixJQUFNQyxXQUFXQyxJQUFBQSwyQkFBb0IsRUFBQ2Q7UUFFdEMsSUFBSWEsYUFBYSxJQUFJLEVBQUU7WUFDckIsSUFBTUUsT0FBTyxJQUFJLEVBQ1hDLE9BQU9ULGNBQWUsR0FBRztZQUUvQkssV0FBV0ssaUJBQVEsQ0FBQ0MsZUFBZSxDQUFDSCxNQUFNQztRQUM1QyxPQUFPO1lBQ0wsSUFBTUQsUUFBT2QsWUFBWWtCLGtCQUFrQixDQUFDTjtZQUU1QyxJQUFJRSxVQUFTLElBQUksRUFBRTtnQkFDakJkLFlBQVlVLEtBQUssQ0FBQyxBQUFDLFFBQW9DRSxPQUE3Qk4sY0FBYSxrQkFBeUIsT0FBVE0sVUFBUztZQUNsRSxPQUFPO2dCQUNMLElBQU1HLFFBQU9ULGNBQWUsR0FBRztnQkFFL0JLLFdBQVdLLGlCQUFRLENBQUNDLGVBQWUsQ0FBQ0gsT0FBTUM7WUFDNUMsQ0FBQztRQUNILENBQUM7UUFFRCxJQUFJSixhQUFhLElBQUksRUFBRTtZQUNyQlgsWUFBWW1CLFdBQVcsQ0FBQ1I7WUFFeEJWLG1CQUFtQixJQUFJO1FBQ3pCLENBQUM7SUFDSCxDQUFDO0lBRUQsSUFBSUEsa0JBQWtCO1FBQ3BCRCxZQUFZb0IsSUFBSSxDQUFDLEFBQUMsaUJBQStCLE9BQWZqQixnQkFBZTtJQUNuRCxDQUFDO0lBRURGLG1CQUNFRCxZQUFZcUIsUUFBUSxDQUFDdkIsZ0JBQ25CRSxZQUFZc0IsSUFBSSxDQUFDeEIsYUFBYTtJQUVsQyxPQUFPRztBQUNUIn0=

package/package.json

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

package/src/axiom.js

@@ -5,30 +5,25 @@ import Label from "./label";
 import { AXIOM_KIND } from "./kinds";
 import { nodeAsString } from "./utilities/string";
 
-import { statementNodeFromStatementJSON } from "./utilities/node";
+import { unqualifiedStatementNodeFromUnqualifiedStatementString, indicativeConditionalNodeFromIndicativeConditionalString } from "./utilities/string";
 
 export default class Axiom {
-  constructor(labels, statementNode, suppositionStatementNodes, consequentStatementNode) {
+  constructor(labels, unqualifiedStatementNode, indicativeConditionalNode) {
     this.labels = labels;
-    this.statementNode = statementNode;
-    this.suppositionStatementNodes = suppositionStatementNodes;
-    this.consequentStatementNode = consequentStatementNode;
+    this.unqualifiedStatementNode = unqualifiedStatementNode;
+    this.indicativeConditionalNode = indicativeConditionalNode;
   }
 
   getLabels() {
     return this.labels;
   }
 
-  getStatementNode() {
-    return this.statementNode;
+  getUnqualifiedStatementNode() {
+    return this.unqualifiedStatementNode;
   }
 
-  getSuppositionStatementNodes() {
-    return this.suppositionStatementNodes;
-  }
-
-  getConsequentStatementNode() {
-    return this.consequentStatementNode;
+  getIndicativeConditionalNode() {
+    return this.indicativeConditionalNode;
   }
 
   matchLabelName(labelName) {
@@ -50,24 +45,17 @@ export default class Axiom {
 
             return labelJSON;
           }),
-          statementString = nodeAsString(this.statementNode),
-          consequentStatementString = nodeAsString(this.consequentStatementNode),
-          suppositionStatementStrings = this.suppositionStatementNodes.map((suppositionStatementNode) => {
-            const suppositionStatementString = nodeAsString(suppositionStatementNode);
-
-            return suppositionStatementString;
-          }),
+          unqualifiedStatementString = nodeAsString(this.unqalifiedStatementNode),
+          indicativeConditionalString = nodeAsString(this.indicativeConditionalNode),
           kind = AXIOM_KIND,
           labels = labelsJSON,  ///
-          statement = statementString,  ///
-          consequent = consequentStatementString, ///
-          suppositions = suppositionStatementStrings, ///
+          unqualifiedStatement = unqualifiedStatementString,  ///
+          indicativeConditional = indicativeConditionalString,  ///
           json = {
             kind,
             labels,
-            statement,
-            consequent,
-            suppositions
+            unqualifiedStatement,
+            indicativeConditional
           };
 
     return json;
@@ -85,45 +73,30 @@ export default class Axiom {
       return label;
     });
 
-    const { statement, suppositions, consequent } = json;
+    let { unqualifiedStatement, indicativeConditional } = json;
 
-    let axiom;
+    let unqualifiedStatementNode = null,
+        indicativeConditionalNode = null;
 
-    if (statement !== null) {
-      const statementJSON = statement,  ///
-            statementNode = statementNodeFromStatementJSON(statementJSON, releaseContext),
-            suppositionStatementNodes = null,
-            consequentStatementNode = null;
+    if (unqualifiedStatement !== null) {
+      const unqualifiedStatementString = unqualifiedStatement;  ///
 
-      axiom = new Axiom(labels, statementNode, suppositionStatementNodes, consequentStatementNode);
-    } else {
-      const statementNode = null,
-            suppositionStatementsJSON = suppositions,  ///
-            suppositionStatementNodes = suppositionStatementsJSON.map((suppositionStatementJSON) => {
-              const suppositionStatementNode = statementNodeFromStatementJSON(suppositionStatementJSON, releaseContext);
+      unqualifiedStatementNode = unqualifiedStatementNodeFromUnqualifiedStatementString(unqualifiedStatementString, releaseContext);
+    }
 
-              return suppositionStatementNode;
-            }),
-            consequentStatementJSON = consequent, ///
-            consequentStatementNode = statementNodeFromStatementJSON(consequentStatementJSON, releaseContext);
+    if (indicativeConditional !== null) {
+      const indicativeConditionalString = indicativeConditional;  ///
 
-      axiom = new Axiom(labels, statementNode, suppositionStatementNodes, consequentStatementNode);
+      indicativeConditionalNode = indicativeConditionalNodeFromIndicativeConditionalString(indicativeConditionalString, releaseContext);
     }
 
-    return axiom;
-  }
-
-  static fromLabelsAndStatementNode(labels, statementNode) {
-    const suppositionStatementNodes = [],
-          consequentStatementNode = null,
-          axiom = new Axiom(labels, statementNode, suppositionStatementNodes, consequentStatementNode);
+    const axiom = new Axiom(labels, unqualifiedStatementNode, indicativeConditionalNode);
 
     return axiom;
   }
 
-  static fromLabelsSuppositionStatementNodesAndConsequentStatementNode(labels, suppositionStatementNodes, consequentStatementNode) {
-    const statementNode = null,
-          axiom = new Axiom(labels, statementNode, suppositionStatementNodes, consequentStatementNode);
+  static fromLabelsUnqualifiedStatementNodeAndIndicativeConditionalNode(labels, unqualifiedStatementNode, indicativeConditionalNode) {
+    const axiom = new Axiom(labels, unqualifiedStatementNode, indicativeConditionalNode);
 
     return axiom;
   }

package/src/combinator.js

@@ -2,7 +2,7 @@
 
 import { nodeAsString } from "./utilities/string";
 import { COMBINATOR_KIND } from "./kinds";
-import { statementNodeFromStatementJSON } from "./utilities/node";
+import { statementNodeFromStatementString } from "./utilities/string";
 
 export default class Combinator {
   constructor(statementNode) {
@@ -33,8 +33,8 @@ export default class Combinator {
 
   static fromJSON(json, releaseContext) {
     const { statement } = json,
-          statementJSON = statement,  ///
-          statementNode = statementNodeFromStatementJSON(statementJSON, releaseContext),
+          statementString = statement,  ///
+          statementNode = statementNodeFromStatementString(statementString, releaseContext),
           combinator = new Combinator(statementNode);
 
     return combinator;

package/src/conclusion.js

@@ -3,7 +3,7 @@
 import { first } from "./utilities/array";
 import { nodeAsString } from "./utilities/string";
 import { metavariableNameFromMetavariableNode } from "./utilities/query";
-import { metastatementNodeFromMetastatementJSON } from "./utilities/node";
+import { metastatementNodeFromMetastatementString } from "./utilities/string";
 import { METAVARIABLE_RULE_NAME, METASTATEMENT_RULE_NAME } from "./ruleNames";
 
 export default class Conclusion {
@@ -36,8 +36,8 @@ export default class Conclusion {
 
   static fromJSON(json, releaseContext) {
     const { metastatement } = json,
-          metastatementJSON = metastatement,  ///
-          metastatementNode = metastatementNodeFromMetastatementJSON(metastatementJSON, releaseContext),
+          metastatementString = metastatement,  ///
+          metastatementNode = metastatementNodeFromMetastatementString(metastatementString, releaseContext),
           conclusion = new Conclusion(metastatementNode);
 
     return conclusion;

package/src/constructor.js

@@ -4,7 +4,7 @@ import Type from "./type";
 
 import { nodeAsString } from "./utilities/string";
 import { CONSTRUCTOR_KIND } from "./kinds";
-import { termNodeFromTermJSON } from "./utilities/node";
+import { termNodeFromTermString } from "./utilities/string";
 
 export default class Constructor {
   constructor(termNode, type) {
@@ -56,8 +56,8 @@ export default class Constructor {
 
   static fromJSON(json, releaseContext) {
     const { term } = json,
-          termJSON = term,  ///
-          termNode = termNodeFromTermJSON(termJSON, releaseContext);
+          termString = term,  ///
+          termNode = termNodeFromTermString(termString, releaseContext);
 
     let { type } = json;
 

package/src/label.js

@@ -1,8 +1,8 @@
 "use strict";
 
 import { nodeAsString } from "./utilities/string";
-import { labelNodeFromLabelJSON } from "./utilities/node";
 import { labelNameFromLabelNode } from "./utilities/query";
+import { labelNodeFromLabelString } from "./utilities/string";
 
 export default class Label {
   constructor(node) {
@@ -35,8 +35,8 @@ export default class Label {
   }
 
   static fromJSON(json, releaseContext) {
-    const labelJSON = json, ///
-          labelNode = labelNodeFromLabelJSON(labelJSON, releaseContext),
+    const labelString = json, ///
+          labelNode = labelNodeFromLabelString(labelString, releaseContext),
           node = labelNode, ///
           label = new Label(node);
 

package/src/lemma.js

@@ -5,36 +5,31 @@ import Label from "./label";
 import { LEMMA_KIND } from "./kinds";
 import { nodeAsString } from "./utilities/string";
 
-import { statementNodeFromStatementJSON } from "./utilities/node";
+import { unqualifiedStatementNodeFromUnqualifiedStatementString, indicativeConditionalNodeFromIndicativeConditionalString } from "./utilities/string";
 
 export default class Lemma {
-  constructor(labels, statementNode, suppositionStatementNodes, consequentStatementNode) {
+  constructor(labels, unqualifiedStatementNode, indicativeConditionalNode) {
     this.labels = labels;
-    this.statementNode = statementNode;
-    this.suppositionStatementNodes = suppositionStatementNodes;
-    this.consequentStatementNode = consequentStatementNode;
+    this.unqualifiedStatementNode = unqualifiedStatementNode;
+    this.indicativeConditionalNode = indicativeConditionalNode;
   }
 
   getLabels() {
     return this.labels;
   }
 
-  getStatementNode() {
-    return this.statementNode;
+  getUnqualifiedStatementNode() {
+    return this.unqualifiedStatementNode;
   }
 
-  getSuppositionStatementNodes() {
-    return this.suppositionStatementNodes;
-  }
-
-  getConsequentStatementNode() {
-    return this.consequentStatementNode;
+  getIndicativeConditionalNode() {
+    return this.indicativeConditionalNode;
   }
 
   matchLabelName(labelName) {
     const matchesLabelName = this.labels.some((label) => {
       const name = labelName, ///
-            labelMatchesName = label.matchName(name);
+        labelMatchesName = label.matchName(name);
 
       if (labelMatchesName) {
         return true;
@@ -50,24 +45,17 @@ export default class Lemma {
 
             return labelJSON;
           }),
-          statementString = nodeAsString(this.statementNode),
-          consequentStatementString = nodeAsString(this.consequentStatementNode),
-          suppositionStatementStrings = this.suppositionStatementNodes.map((suppositionStatementNode) => {
-            const suppositionStatementString = nodeAsString(suppositionStatementNode);
-
-            return suppositionStatementString;
-          }),
+          unqualifiedStatementString = nodeAsString(this.unqalifiedStatementNode),
+          indicativeConditionalString = nodeAsString(this.indicativeConditionalNode),
           kind = LEMMA_KIND,
           labels = labelsJSON,  ///
-          statement = statementString,  ///
-          consequent = consequentStatementString, ///
-          suppositions = suppositionStatementStrings, ///
+          unqualifiedStatement = unqualifiedStatementString,  ///
+          indicativeConditional = indicativeConditionalString,  ///
           json = {
             kind,
             labels,
-            statement,
-            consequent,
-            suppositions
+            unqualifiedStatement,
+            indicativeConditional
           };
 
     return json;
@@ -85,45 +73,30 @@ export default class Lemma {
       return label;
     });
 
-    const { statement, suppositions, consequent } = json;
+    let { unqualifiedStatement, indicativeConditional } = json;
 
-    let lemma;
+    let unqualifiedStatementNode = null,
+        indicativeConditionalNode = null;
 
-    if (statement !== null) {
-      const statementJSON = statement,  ///
-            statementNode = statementNodeFromStatementJSON(statementJSON, releaseContext),
-            suppositionStatementNodes = null,
-            consequentStatementNode = null;
+    if (unqualifiedStatement !== null) {
+      const unqualifiedStatementString = unqualifiedStatement;  ///
 
-      lemma = new Lemma(labels, statementNode, suppositionStatementNodes, consequentStatementNode);
-    } else {
-      const statementNode = null,
-            suppositionStatementsJSON = suppositions,  ///
-            suppositionStatementNodes = suppositionStatementsJSON.map((suppositionStatementJSON) => {
-              const suppositionStatementNode = statementNodeFromStatementJSON(suppositionStatementJSON, releaseContext);
+      unqualifiedStatementNode = unqualifiedStatementNodeFromUnqualifiedStatementString(unqualifiedStatementString, releaseContext);
+    }
 
-              return suppositionStatementNode;
-            }),
-            consequentStatementJSON = consequent, ///
-            consequentStatementNode = statementNodeFromStatementJSON(consequentStatementJSON, releaseContext);
+    if (indicativeConditional !== null) {
+      const indicativeConditionalString = indicativeConditional;  ///
 
-      lemma = new Lemma(labels, statementNode, suppositionStatementNodes, consequentStatementNode);
+      indicativeConditionalNode = indicativeConditionalNodeFromIndicativeConditionalString(indicativeConditionalString, releaseContext);
     }
 
-    return lemma;
-  }
-
-  static fromLabelsAndStatementNode(labels, statementNode) {
-    const suppositionStatementNodes = [],
-          consequentStatementNode = null,
-          lemma = new Lemma(labels, statementNode, suppositionStatementNodes, consequentStatementNode);
+    const lemma = new Lemma(labels, unqualifiedStatementNode, indicativeConditionalNode);
 
     return lemma;
   }
 
-  static fromLabelsSuppositionStatementNodesAndConsequentStatementNode(labels, suppositionStatementNodes, consequentStatementNode) {
-    const statementNode = null,
-          lemma = new Lemma(labels, statementNode, suppositionStatementNodes, consequentStatementNode);
+  static fromLabelsUnqualifiedStatementNodeAndIndicativeConditionalNode(labels, unqualifiedStatementNode, indicativeConditionalNode) {
+    const lemma = new Lemma(labels, unqualifiedStatementNode, indicativeConditionalNode);
 
     return lemma;
   }