occam-verify-cli 0.0.1003 → 0.0.1006

package/README.md

@@ -46,8 +46,6 @@ Options:
   --tail|-t                                       Sets the size of the tail of the log messages. The default is ten. 
 
   --follow|-f                                     Show the log messages immediately instead of tailing them. The default is false.
-
-  --verbose|-x                                    Verbose output. This shows the output for the dependency as well as the project verification.
 ```
 
 ## Building

package/bin/abbreviations.js

@@ -1,11 +1,10 @@
 "use strict";
 
-const { HELP_OPTION, TAIL_OPTION, FOLLOW_OPTION, VERBOSE_OPTION, VERSION_OPTION, LOG_LEVEL_OPTION } = require("./options");
+const { HELP_OPTION, TAIL_OPTION, FOLLOW_OPTION, VERSION_OPTION, LOG_LEVEL_OPTION } = require("./options");
 
 const h = HELP_OPTION,
       t = TAIL_OPTION,
       f = FOLLOW_OPTION,
-      x = VERBOSE_OPTION,
       v = VERSION_OPTION,
       l = LOG_LEVEL_OPTION
 
@@ -13,7 +12,6 @@ module.exports = {
   h,
   t,
   f,
-  x,
   v,
   l
 };

package/bin/action/help.js

@@ -21,8 +21,6 @@ Options:
 
   --follow|-f                                     Show the log messages immediately instead of tailing them. The default is false.
 
-  --verbose|-x                                    Verbose output. This shows the output for the dependency as well as the project verification.
-
 Further information:
 
 Please see the readme file on GitHub:

package/bin/action/verify.js

@@ -8,7 +8,7 @@ const { trimTrailingSlash } = require("../utilities/string"),
 
 const { createReleaseContext, initialiseReleaseContext } = releaseContextUtilities;
 
-function verifyAction(argument, verbose, log) {
+function verifyAction(argument, log) {
   const name = trimTrailingSlash(argument), ///
         context = {},
         dependency = Dependency.fromName(name),
@@ -17,7 +17,6 @@ function verifyAction(argument, verbose, log) {
 
   Object.assign(context, {
     log,
-    verbose,
     releaseContextMap,
     releaseContextFromDependency
   });
@@ -41,29 +40,10 @@ function verifyAction(argument, verbose, log) {
       return;
     }
 
-    const releaseName = name, ///
-          releaseContext = releaseContextMap[releaseName],
-          releaseContextInitialised = initialiseReleaseContext(dependency, context);
-
-    if (!releaseContextInitialised) {
-      log.warning(`The '${name}' project or package context cannot be initialised.`);
-
-      stopClock(now, log);
-
-      return;
-    }
-
-    const releaseContextVerified = releaseContext.isVerified();
+    initialiseReleaseContext(dependency, context);
 
-    if (releaseContextVerified) {
-      log.warning(`The '${name}' package does not need to be verified.`);
-
-      stopClock(now, log);
-
-      return;
-    }
-
-    const releaseVerified = verifyRelease(releaseName, releaseContextMap);
+    const releaseName = name, ///
+          releaseVerified = verifyRelease(releaseName, releaseContextMap);
 
     if (!releaseVerified) {
       log.warning(`The '${name}' project or package context cannot be verified.`);

package/bin/defaults.js

@@ -7,7 +7,6 @@ const { INFO_LEVEL } = levels;
 const DEFAULT_HELP = false,
       DEFAULT_TAIL = 10,
       DEFAULT_FOLLOW = false,
-      DEFAULT_VERBOSE = false,
       DEFAULT_VERSION = false,
       DEFAULT_LOG_LEVEL = INFO_LEVEL;
 
@@ -15,7 +14,6 @@ module.exports = {
   DEFAULT_HELP,
   DEFAULT_TAIL,
   DEFAULT_FOLLOW,
-  DEFAULT_VERBOSE,
   DEFAULT_VERSION,
   DEFAULT_LOG_LEVEL
 };

package/bin/main.js

@@ -8,12 +8,11 @@ const helpAction = require("./action/help"),
 
 const { NO_COMMAND_GIVEN_MESSAGE } = require("./messages"),
       { HELP_COMMAND, VERIFY_COMMAND, VERSION_COMMAND } = require("./commands"),
-      { DEFAULT_TAIL, DEFAULT_FOLLOW, DEFAULT_VERBOSE, DEFAULT_LOG_LEVEL } = require("./defaults");
+      { DEFAULT_TAIL, DEFAULT_FOLLOW, DEFAULT_LOG_LEVEL } = require("./defaults");
 
 function main(command, argument, options) {
   const { tail = DEFAULT_TAIL,
           follow = DEFAULT_FOLLOW,
-          verbose = DEFAULT_VERBOSE,
           logLevel = DEFAULT_LOG_LEVEL } = options;
 
   const log = Log.fromFollowAndLogLevel(follow, logLevel);
@@ -32,7 +31,7 @@ function main(command, argument, options) {
     }
 
     case VERIFY_COMMAND: {
-      verifyAction(argument, verbose, log);
+      verifyAction(argument, log);
 
       break;
     }
@@ -46,7 +45,7 @@ function main(command, argument, options) {
     default: {
       argument = command; ///
 
-      verifyAction(argument, verbose, log);
+      verifyAction(argument, log);
 
       break;
     }

package/bin/options.js

@@ -4,7 +4,6 @@ const HELP_OPTION = "help",
       TAIL_OPTION = "tail",
       FOLLOW_OPTION = "follow",
       VERSION_OPTION = "version",
-      VERBOSE_OPTION = "verbose",
       LOG_LEVEL_OPTION = "log-level";
 
 module.exports = {
@@ -12,6 +11,5 @@ module.exports = {
   TAIL_OPTION,
   FOLLOW_OPTION,
   VERSION_OPTION,
-  VERBOSE_OPTION,
   LOG_LEVEL_OPTION
 };

package/bin/utilities/releaseContext.js

@@ -70,8 +70,14 @@ function releaseContextFromJSON(json, context) {
 
   entries = Entries.fromJSON(json);
 
+  ({context} = json); ///
+
+  const contextJSON = context;  ///
+
+  json = contextJSON; ///
+
   const released = true,
-        releaseContext = ReleaseContext.fromLogNameEntriesAndReleased(log, name, entries, released);
+        releaseContext = ReleaseContext.fromLogNameJSONEntriesAndReleased(log, name, json, entries, released);
 
   return releaseContext;
 }
@@ -87,10 +93,11 @@ function releaseContextFromProject(project, context) {
     if (metaJSONFileValid) {
       const { log } = context,
             name = project.getName(),
+            json = null,
             entries = project.getEntries(),
             released = false;
 
-      releaseContext = ReleaseContext.fromLogNameEntriesAndReleased(log, name, entries, released);
+      releaseContext = ReleaseContext.fromLogNameJSONEntriesAndReleased(log, name, json, entries, released);
     }
   }
 

package/lib/assertion/subproof.js

@@ -0,0 +1,106 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return SubproofAssertion;
+    }
+});
+var _statement = /*#__PURE__*/ _interop_require_default(require("../statement"));
+var _local = /*#__PURE__*/ _interop_require_default(require("../context/local"));
+var _metaLevel = /*#__PURE__*/ _interop_require_default(require("../unifier/metaLevel"));
+var _array = require("../utilities/array");
+var _query = require("../utilities/query");
+function _class_call_check(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+        throw new TypeError("Cannot call a class as a function");
+    }
+}
+function _defineProperties(target, props) {
+    for(var i = 0; i < props.length; i++){
+        var descriptor = props[i];
+        descriptor.enumerable = descriptor.enumerable || false;
+        descriptor.configurable = true;
+        if ("value" in descriptor) descriptor.writable = true;
+        Object.defineProperty(target, descriptor.key, descriptor);
+    }
+}
+function _create_class(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties(Constructor, staticProps);
+    return Constructor;
+}
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+var statementNodesQuery = (0, _query.nodesQuery)("/subproofAssertion/statement"), subproofAssertionNodeQuery = (0, _query.nodeQuery)("/statement/subproofAssertion");
+var SubproofAssertion = /*#__PURE__*/ function() {
+    function SubproofAssertion(fileContext, string, statements) {
+        _class_call_check(this, SubproofAssertion);
+        this.fileContext = fileContext;
+        this.string = string;
+        this.statements = statements;
+    }
+    _create_class(SubproofAssertion, [
+        {
+            key: "getFileContext",
+            value: function getFileContext() {
+                return this.fileContext;
+            }
+        },
+        {
+            key: "getString",
+            value: function getString() {
+                return this.string;
+            }
+        },
+        {
+            key: "getStatements",
+            value: function getStatements() {
+                return this.statements;
+            }
+        },
+        {
+            key: "unifySubproof",
+            value: function unifySubproof(subproof, substitutions, localContext) {
+                var _this = this;
+                var subproofUnified;
+                var subproofString = subproof.getString(), subproofStatements = subproof.getStatements(), subproofAssertionString = this.string; ///
+                localContext.trace("Unifying the '".concat(subproofString, "' subproof with the '").concat(subproofAssertionString, "' subproof assertion..."));
+                subproofUnified = (0, _array.match)(this.statements, subproofStatements, function(statement, subproofStatement) {
+                    var statementNode = statement.getNode(), subproofStatementNode = subproofStatement.getNode(), nodeA = statementNode, nodeB = subproofStatementNode, fileContextA = _this.fileContext, localContextA = _local.default.fromFileContext(fileContextA), localContextB = localContext, unified = _metaLevel.default.unify(nodeA, nodeB, substitutions, localContextA, localContextB);
+                    if (unified) {
+                        return true;
+                    }
+                });
+                if (subproofUnified) {
+                    localContext.debug("...unified the '".concat(subproofString, "' subproof with the '").concat(subproofAssertionString, "' subproof assertion."));
+                }
+                return subproofUnified;
+            }
+        }
+    ], [
+        {
+            key: "fromStatementNode",
+            value: function fromStatementNode(statementNode, fileContext) {
+                var subproofAssertion = null;
+                var subproofAssertionNode = subproofAssertionNodeQuery(statementNode);
+                if (subproofAssertionNode !== null) {
+                    var node = subproofAssertionNode, string = fileContext.nodeAsString(node), localContext = _local.default.fromFileContext(fileContext), statementNodes = statementNodesQuery(subproofAssertionNode), statements = statementNodes.map(function(statementNode) {
+                        var statement = _statement.default.fromStatementNode(statementNode, localContext);
+                        return statement;
+                    });
+                    subproofAssertion = new SubproofAssertion(fileContext, string, statements);
+                }
+                return subproofAssertion;
+            }
+        }
+    ]);
+    return SubproofAssertion;
+}();
+
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hc3NlcnRpb24vc3VicHJvb2YuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBTdGF0ZW1lbnQgZnJvbSBcIi4uL3N0YXRlbWVudFwiO1xuaW1wb3J0IExvY2FsQ29udGV4dCBmcm9tIFwiLi4vY29udGV4dC9sb2NhbFwiO1xuaW1wb3J0IG1ldGFMZXZlbFVuaWZpZXIgZnJvbSBcIi4uL3VuaWZpZXIvbWV0YUxldmVsXCI7XG5cbmltcG9ydCB7IG1hdGNoIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9hcnJheVwiO1xuaW1wb3J0IHsgbm9kZVF1ZXJ5LCBub2Rlc1F1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5jb25zdCBzdGF0ZW1lbnROb2Rlc1F1ZXJ5ID0gbm9kZXNRdWVyeShcIi9zdWJwcm9vZkFzc2VydGlvbi9zdGF0ZW1lbnRcIiksXG4gICAgICBzdWJwcm9vZkFzc2VydGlvbk5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9zdGF0ZW1lbnQvc3VicHJvb2ZBc3NlcnRpb25cIik7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIFN1YnByb29mQXNzZXJ0aW9uIHtcbiAgY29uc3RydWN0b3IoZmlsZUNvbnRleHQsIHN0cmluZywgc3RhdGVtZW50cykge1xuICAgIHRoaXMuZmlsZUNvbnRleHQgPSBmaWxlQ29udGV4dDtcbiAgICB0aGlzLnN0cmluZyA9IHN0cmluZztcbiAgICB0aGlzLnN0YXRlbWVudHMgPSBzdGF0ZW1lbnRzO1xuICB9XG5cbiAgZ2V0RmlsZUNvbnRleHQoKSB7XG4gICAgcmV0dXJuIHRoaXMuZmlsZUNvbnRleHQ7XG4gIH1cblxuICBnZXRTdHJpbmcoKSB7XG4gICAgcmV0dXJuIHRoaXMuc3RyaW5nO1xuICB9XG5cbiAgZ2V0U3RhdGVtZW50cygpIHtcbiAgICByZXR1cm4gdGhpcy5zdGF0ZW1lbnRzO1xuICB9XG5cbiAgdW5pZnlTdWJwcm9vZihzdWJwcm9vZiwgc3Vic3RpdHV0aW9ucywgbG9jYWxDb250ZXh0KSB7XG4gICAgbGV0IHN1YnByb29mVW5pZmllZDtcblxuICAgIGNvbnN0IHN1YnByb29mU3RyaW5nID0gc3VicHJvb2YuZ2V0U3RyaW5nKCksXG4gICAgICAgICAgc3VicHJvb2ZTdGF0ZW1lbnRzID0gc3VicHJvb2YuZ2V0U3RhdGVtZW50cygpLFxuICAgICAgICAgIHN1YnByb29mQXNzZXJ0aW9uU3RyaW5nID0gdGhpcy5zdHJpbmc7ICAvLy9cblxuICAgIGxvY2FsQ29udGV4dC50cmFjZShgVW5pZnlpbmcgdGhlICcke3N1YnByb29mU3RyaW5nfScgc3VicHJvb2Ygd2l0aCB0aGUgJyR7c3VicHJvb2ZBc3NlcnRpb25TdHJpbmd9JyBzdWJwcm9vZiBhc3NlcnRpb24uLi5gKTtcblxuICAgIHN1YnByb29mVW5pZmllZCA9IG1hdGNoKHRoaXMuc3RhdGVtZW50cywgc3VicHJvb2ZTdGF0ZW1lbnRzLCAoc3RhdGVtZW50LCBzdWJwcm9vZlN0YXRlbWVudCkgPT4ge1xuICAgICAgY29uc3Qgc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudC5nZXROb2RlKCksXG4gICAgICAgICAgICBzdWJwcm9vZlN0YXRlbWVudE5vZGUgPSBzdWJwcm9vZlN0YXRlbWVudC5nZXROb2RlKCksXG4gICAgICAgICAgICBub2RlQSA9IHN0YXRlbWVudE5vZGUsICAvLy9cbiAgICAgICAgICAgIG5vZGVCID0gc3VicHJvb2ZTdGF0ZW1lbnROb2RlLCAgLy8vXG4gICAgICAgICAgICBmaWxlQ29udGV4dEEgPSB0aGlzLmZpbGVDb250ZXh0LCAgLy8vXG4gICAgICAgICAgICBsb2NhbENvbnRleHRBID0gTG9jYWxDb250ZXh0LmZyb21GaWxlQ29udGV4dChmaWxlQ29udGV4dEEpLFxuICAgICAgICAgICAgbG9jYWxDb250ZXh0QiA9IGxvY2FsQ29udGV4dCwgLy8vXG4gICAgICAgICAgICB1bmlmaWVkID0gbWV0YUxldmVsVW5pZmllci51bmlmeShub2RlQSwgbm9kZUIsIHN1YnN0aXR1dGlvbnMsIGxvY2FsQ29udGV4dEEsIGxvY2FsQ29udGV4dEIpO1xuXG4gICAgICBpZiAodW5pZmllZCkge1xuICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICAgIH1cbiAgICB9KTtcblxuICAgIGlmIChzdWJwcm9vZlVuaWZpZWQpIHtcbiAgICAgIGxvY2FsQ29udGV4dC5kZWJ1ZyhgLi4udW5pZmllZCB0aGUgJyR7c3VicHJvb2ZTdHJpbmd9JyBzdWJwcm9vZiB3aXRoIHRoZSAnJHtzdWJwcm9vZkFzc2VydGlvblN0cmluZ30nIHN1YnByb29mIGFzc2VydGlvbi5gKTtcbiAgICB9XG5cbiAgICByZXR1cm4gc3VicHJvb2ZVbmlmaWVkO1xuICB9XG5cbiAgc3RhdGljIGZyb21TdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUsIGZpbGVDb250ZXh0KSB7XG4gICAgbGV0IHN1YnByb29mQXNzZXJ0aW9uID0gbnVsbDtcblxuICAgIGNvbnN0IHN1YnByb29mQXNzZXJ0aW9uTm9kZSA9IHN1YnByb29mQXNzZXJ0aW9uTm9kZVF1ZXJ5KHN0YXRlbWVudE5vZGUpO1xuXG4gICAgaWYgKHN1YnByb29mQXNzZXJ0aW9uTm9kZSAhPT0gbnVsbCkge1xuICAgICAgY29uc3Qgbm9kZSA9IHN1YnByb29mQXNzZXJ0aW9uTm9kZSwgLy8vXG4gICAgICAgICAgICBzdHJpbmcgPSBmaWxlQ29udGV4dC5ub2RlQXNTdHJpbmcobm9kZSksXG4gICAgICAgICAgICBsb2NhbENvbnRleHQgPSBMb2NhbENvbnRleHQuZnJvbUZpbGVDb250ZXh0KGZpbGVDb250ZXh0KSxcbiAgICAgICAgICAgIHN0YXRlbWVudE5vZGVzID0gc3RhdGVtZW50Tm9kZXNRdWVyeShzdWJwcm9vZkFzc2VydGlvbk5vZGUpLFxuICAgICAgICAgICAgc3RhdGVtZW50cyA9IHN0YXRlbWVudE5vZGVzLm1hcCgoc3RhdGVtZW50Tm9kZSkgPT4ge1xuICAgICAgICAgICAgICBjb25zdCBzdGF0ZW1lbnQgPSBTdGF0ZW1lbnQuZnJvbVN0YXRlbWVudE5vZGUoc3RhdGVtZW50Tm9kZSwgbG9jYWxDb250ZXh0KTtcblxuICAgICAgICAgICAgICByZXR1cm4gc3RhdGVtZW50O1xuICAgICAgICAgICAgfSk7XG5cbiAgICAgIHN1YnByb29mQXNzZXJ0aW9uID0gbmV3IFN1YnByb29mQXNzZXJ0aW9uKGZpbGVDb250ZXh0LCBzdHJpbmcsIHN0YXRlbWVudHMpO1xuICAgIH1cblxuICAgIHJldHVybiBzdWJwcm9vZkFzc2VydGlvbjtcbiAgfVxufSJdLCJuYW1lcyI6WyJTdWJwcm9vZkFzc2VydGlvbiIsInN0YXRlbWVudE5vZGVzUXVlcnkiLCJub2Rlc1F1ZXJ5Iiwic3VicHJvb2ZBc3NlcnRpb25Ob2RlUXVlcnkiLCJub2RlUXVlcnkiLCJmaWxlQ29udGV4dCIsInN0cmluZyIsInN0YXRlbWVudHMiLCJnZXRGaWxlQ29udGV4dCIsImdldFN0cmluZyIsImdldFN0YXRlbWVudHMiLCJ1bmlmeVN1YnByb29mIiwic3VicHJvb2YiLCJzdWJzdGl0dXRpb25zIiwibG9jYWxDb250ZXh0Iiwic3VicHJvb2ZVbmlmaWVkIiwic3VicHJvb2ZTdHJpbmciLCJzdWJwcm9vZlN0YXRlbWVudHMiLCJzdWJwcm9vZkFzc2VydGlvblN0cmluZyIsInRyYWNlIiwibWF0Y2giLCJzdGF0ZW1lbnQiLCJzdWJwcm9vZlN0YXRlbWVudCIsInN0YXRlbWVudE5vZGUiLCJnZXROb2RlIiwic3VicHJvb2ZTdGF0ZW1lbnROb2RlIiwibm9kZUEiLCJub2RlQiIsImZpbGVDb250ZXh0QSIsImxvY2FsQ29udGV4dEEiLCJMb2NhbENvbnRleHQiLCJmcm9tRmlsZUNvbnRleHQiLCJsb2NhbENvbnRleHRCIiwidW5pZmllZCIsIm1ldGFMZXZlbFVuaWZpZXIiLCJ1bmlmeSIsImRlYnVnIiwiZnJvbVN0YXRlbWVudE5vZGUiLCJzdWJwcm9vZkFzc2VydGlvbiIsInN1YnByb29mQXNzZXJ0aW9uTm9kZSIsIm5vZGUiLCJub2RlQXNTdHJpbmciLCJzdGF0ZW1lbnROb2RlcyIsIm1hcCIsIlN0YXRlbWVudCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7ZUFZcUJBOzs7Z0VBVkM7NERBQ0c7Z0VBQ0k7cUJBRVA7cUJBQ2dCOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRXRDLElBQU1DLHNCQUFzQkMsSUFBQUEsaUJBQVUsRUFBQyxpQ0FDakNDLDZCQUE2QkMsSUFBQUEsZ0JBQVMsRUFBQztBQUU5QixJQUFBLEFBQU1KLGtDQUFOO2FBQU1BLGtCQUNQSyxXQUFXLEVBQUVDLE1BQU0sRUFBRUMsVUFBVTtnQ0FEeEJQO1FBRWpCLElBQUksQ0FBQ0ssV0FBVyxHQUFHQTtRQUNuQixJQUFJLENBQUNDLE1BQU0sR0FBR0E7UUFDZCxJQUFJLENBQUNDLFVBQVUsR0FBR0E7O2tCQUpEUDs7WUFPbkJRLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxPQUFPLElBQUksQ0FBQ0gsV0FBVztZQUN6Qjs7O1lBRUFJLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxPQUFPLElBQUksQ0FBQ0gsTUFBTTtZQUNwQjs7O1lBRUFJLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxPQUFPLElBQUksQ0FBQ0gsVUFBVTtZQUN4Qjs7O1lBRUFJLEtBQUFBO21CQUFBQSxTQUFBQSxjQUFjQyxRQUFRLEVBQUVDLGFBQWEsRUFBRUMsWUFBWTs7Z0JBQ2pELElBQUlDO2dCQUVKLElBQU1DLGlCQUFpQkosU0FBU0gsU0FBUyxJQUNuQ1EscUJBQXFCTCxTQUFTRixhQUFhLElBQzNDUSwwQkFBMEIsSUFBSSxDQUFDWixNQUFNLEVBQUcsR0FBRztnQkFFakRRLGFBQWFLLEtBQUssQ0FBQyxBQUFDLGlCQUFzREQsT0FBdENGLGdCQUFlLHlCQUErQyxPQUF4QkUseUJBQXdCO2dCQUVsR0gsa0JBQWtCSyxJQUFBQSxZQUFLLEVBQUMsSUFBSSxDQUFDYixVQUFVLEVBQUVVLG9CQUFvQixTQUFDSSxXQUFXQztvQkFDdkUsSUFBTUMsZ0JBQWdCRixVQUFVRyxPQUFPLElBQ2pDQyx3QkFBd0JILGtCQUFrQkUsT0FBTyxJQUNqREUsUUFBUUgsZUFDUkksUUFBUUYsdUJBQ1JHLGVBQWUsTUFBS3ZCLFdBQVcsRUFDL0J3QixnQkFBZ0JDLGNBQVksQ0FBQ0MsZUFBZSxDQUFDSCxlQUM3Q0ksZ0JBQWdCbEIsY0FDaEJtQixVQUFVQyxrQkFBZ0IsQ0FBQ0MsS0FBSyxDQUFDVCxPQUFPQyxPQUFPZCxlQUFlZ0IsZUFBZUc7b0JBRW5GLElBQUlDLFNBQVM7d0JBQ1gsT0FBTztvQkFDVDtnQkFDRjtnQkFFQSxJQUFJbEIsaUJBQWlCO29CQUNuQkQsYUFBYXNCLEtBQUssQ0FBQyxBQUFDLG1CQUF3RGxCLE9BQXRDRixnQkFBZSx5QkFBK0MsT0FBeEJFLHlCQUF3QjtnQkFDdEc7Z0JBRUEsT0FBT0g7WUFDVDs7OztZQUVPc0IsS0FBQUE7bUJBQVAsU0FBT0Esa0JBQWtCZCxhQUFhLEVBQUVsQixXQUFXO2dCQUNqRCxJQUFJaUMsb0JBQW9CO2dCQUV4QixJQUFNQyx3QkFBd0JwQywyQkFBMkJvQjtnQkFFekQsSUFBSWdCLDBCQUEwQixNQUFNO29CQUNsQyxJQUFNQyxPQUFPRCx1QkFDUGpDLFNBQVNELFlBQVlvQyxZQUFZLENBQUNELE9BQ2xDMUIsZUFBZWdCLGNBQVksQ0FBQ0MsZUFBZSxDQUFDMUIsY0FDNUNxQyxpQkFBaUJ6QyxvQkFBb0JzQyx3QkFDckNoQyxhQUFhbUMsZUFBZUMsR0FBRyxDQUFDLFNBQUNwQjt3QkFDL0IsSUFBTUYsWUFBWXVCLGtCQUFTLENBQUNQLGlCQUFpQixDQUFDZCxlQUFlVDt3QkFFN0QsT0FBT087b0JBQ1Q7b0JBRU5pQixvQkFBb0IsSUFsRUx0QyxrQkFrRTJCSyxhQUFhQyxRQUFRQztnQkFDakU7Z0JBRUEsT0FBTytCO1lBQ1Q7OztXQXRFbUJ0QyJ9

package/lib/assignment/metavariable.js

@@ -43,7 +43,7 @@ var MetavariableAssignment = /*#__PURE__*/ function() {
             key: "assign",
             value: function assign(fileContext) {
                 var metavariableAdded = fileContext.addMetavariable(this.metavariable), metavariableNode = this.metavariable.getNode(), metavariableString = fileContext.nodeAsString(metavariableNode), metavariableAssigned = metavariableAdded; ///
-                metavariableAssigned ? fileContext.trace("Assigned the '".concat(metavariableString, "' metavariable."), metavariableNode) : fileContext.debug("Unable to assign the '".concat(metavariableString, "' metavariable."), metavariableNode);
+                metavariableAssigned ? fileContext.trace("Assigned the '".concat(metavariableString, "' metavariable.")) : fileContext.debug("Unable to assign the '".concat(metavariableString, "' metavariable."));
                 return metavariableAssigned;
             }
         }
@@ -59,4 +59,4 @@ var MetavariableAssignment = /*#__PURE__*/ function() {
     return MetavariableAssignment;
 }();
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hc3NpZ25tZW50L21ldGF2YXJpYWJsZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgTWV0YXZhcmlhYmxlQXNzaWdubWVudCB7XG4gIGNvbnN0cnVjdG9yKG1ldGF2YXJpYWJsZSkge1xuICAgIHRoaXMubWV0YXZhcmlhYmxlID0gbWV0YXZhcmlhYmxlO1xuICB9XG5cbiAgZ2V0TWV0YXZhcmlhYmxlKCkge1xuICAgIHJldHVybiB0aGlzLm1ldGF2YXJpYWJsZTtcbiAgfVxuXG4gIGFzc2lnbihmaWxlQ29udGV4dCkge1xuICAgIGNvbnN0IG1ldGF2YXJpYWJsZUFkZGVkID0gZmlsZUNvbnRleHQuYWRkTWV0YXZhcmlhYmxlKHRoaXMubWV0YXZhcmlhYmxlKSxcbiAgICAgICAgICBtZXRhdmFyaWFibGVOb2RlID0gdGhpcy5tZXRhdmFyaWFibGUuZ2V0Tm9kZSgpLFxuICAgICAgICAgIG1ldGF2YXJpYWJsZVN0cmluZyA9IGZpbGVDb250ZXh0Lm5vZGVBc1N0cmluZyhtZXRhdmFyaWFibGVOb2RlKSxcbiAgICAgICAgICBtZXRhdmFyaWFibGVBc3NpZ25lZCA9IG1ldGF2YXJpYWJsZUFkZGVkOyAvLy9cblxuICAgIG1ldGF2YXJpYWJsZUFzc2lnbmVkID9cbiAgICAgIGZpbGVDb250ZXh0LnRyYWNlKGBBc3NpZ25lZCB0aGUgJyR7bWV0YXZhcmlhYmxlU3RyaW5nfScgbWV0YXZhcmlhYmxlLmAsIG1ldGF2YXJpYWJsZU5vZGUpIDpcbiAgICAgICAgZmlsZUNvbnRleHQuZGVidWcoYFVuYWJsZSB0byBhc3NpZ24gdGhlICcke21ldGF2YXJpYWJsZVN0cmluZ30nIG1ldGF2YXJpYWJsZS5gLCBtZXRhdmFyaWFibGVOb2RlKTtcblxuICAgIHJldHVybiBtZXRhdmFyaWFibGVBc3NpZ25lZDtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tTWV0YXZhcmlhYmxlKG1ldGF2YXJpYWJsZSkge1xuICAgIGNvbnN0IG1ldGF2YXJpYWJsZUFzc2lnbm1lbnQgPSBuZXcgTWV0YXZhcmlhYmxlQXNzaWdubWVudChtZXRhdmFyaWFibGUpO1xuXG4gICAgcmV0dXJuIG1ldGF2YXJpYWJsZUFzc2lnbm1lbnQ7XG4gIH1cbn1cbiJdLCJuYW1lcyI6WyJNZXRhdmFyaWFibGVBc3NpZ25tZW50IiwibWV0YXZhcmlhYmxlIiwiZ2V0TWV0YXZhcmlhYmxlIiwiYXNzaWduIiwiZmlsZUNvbnRleHQiLCJtZXRhdmFyaWFibGVBZGRlZCIsImFkZE1ldGF2YXJpYWJsZSIsIm1ldGF2YXJpYWJsZU5vZGUiLCJnZXROb2RlIiwibWV0YXZhcmlhYmxlU3RyaW5nIiwibm9kZUFzU3RyaW5nIiwibWV0YXZhcmlhYmxlQXNzaWduZWQiLCJ0cmFjZSIsImRlYnVnIiwiZnJvbU1ldGF2YXJpYWJsZSIsIm1ldGF2YXJpYWJsZUFzc2lnbm1lbnQiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7O2VBRXFCQTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFOLElBQUEsQUFBTUEsdUNBQU47YUFBTUEsdUJBQ1BDLFlBQVk7Z0NBRExEO1FBRWpCLElBQUksQ0FBQ0MsWUFBWSxHQUFHQTs7a0JBRkhEOztZQUtuQkUsS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLE9BQU8sSUFBSSxDQUFDRCxZQUFZO1lBQzFCOzs7WUFFQUUsS0FBQUE7bUJBQUFBLFNBQUFBLE9BQU9DLFdBQVc7Z0JBQ2hCLElBQU1DLG9CQUFvQkQsWUFBWUUsZUFBZSxDQUFDLElBQUksQ0FBQ0wsWUFBWSxHQUNqRU0sbUJBQW1CLElBQUksQ0FBQ04sWUFBWSxDQUFDTyxPQUFPLElBQzVDQyxxQkFBcUJMLFlBQVlNLFlBQVksQ0FBQ0gsbUJBQzlDSSx1QkFBdUJOLG1CQUFtQixHQUFHO2dCQUVuRE0sdUJBQ0VQLFlBQVlRLEtBQUssQ0FBQyxBQUFDLGlCQUFtQyxPQUFuQkgsb0JBQW1CLG9CQUFrQkYsb0JBQ3RFSCxZQUFZUyxLQUFLLENBQUMsQUFBQyx5QkFBMkMsT0FBbkJKLG9CQUFtQixvQkFBa0JGO2dCQUVwRixPQUFPSTtZQUNUOzs7O1lBRU9HLEtBQUFBO21CQUFQLFNBQU9BLGlCQUFpQmIsWUFBWTtnQkFDbEMsSUFBTWMseUJBQXlCLElBdkJkZix1QkF1QnlDQztnQkFFMUQsT0FBT2M7WUFDVDs7O1dBMUJtQmYifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hc3NpZ25tZW50L21ldGF2YXJpYWJsZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgTWV0YXZhcmlhYmxlQXNzaWdubWVudCB7XG4gIGNvbnN0cnVjdG9yKG1ldGF2YXJpYWJsZSkge1xuICAgIHRoaXMubWV0YXZhcmlhYmxlID0gbWV0YXZhcmlhYmxlO1xuICB9XG5cbiAgZ2V0TWV0YXZhcmlhYmxlKCkge1xuICAgIHJldHVybiB0aGlzLm1ldGF2YXJpYWJsZTtcbiAgfVxuXG4gIGFzc2lnbihmaWxlQ29udGV4dCkge1xuICAgIGNvbnN0IG1ldGF2YXJpYWJsZUFkZGVkID0gZmlsZUNvbnRleHQuYWRkTWV0YXZhcmlhYmxlKHRoaXMubWV0YXZhcmlhYmxlKSxcbiAgICAgICAgICBtZXRhdmFyaWFibGVOb2RlID0gdGhpcy5tZXRhdmFyaWFibGUuZ2V0Tm9kZSgpLFxuICAgICAgICAgIG1ldGF2YXJpYWJsZVN0cmluZyA9IGZpbGVDb250ZXh0Lm5vZGVBc1N0cmluZyhtZXRhdmFyaWFibGVOb2RlKSxcbiAgICAgICAgICBtZXRhdmFyaWFibGVBc3NpZ25lZCA9IG1ldGF2YXJpYWJsZUFkZGVkOyAvLy9cblxuICAgIG1ldGF2YXJpYWJsZUFzc2lnbmVkID9cbiAgICAgIGZpbGVDb250ZXh0LnRyYWNlKGBBc3NpZ25lZCB0aGUgJyR7bWV0YXZhcmlhYmxlU3RyaW5nfScgbWV0YXZhcmlhYmxlLmApIDpcbiAgICAgICAgZmlsZUNvbnRleHQuZGVidWcoYFVuYWJsZSB0byBhc3NpZ24gdGhlICcke21ldGF2YXJpYWJsZVN0cmluZ30nIG1ldGF2YXJpYWJsZS5gKTtcblxuICAgIHJldHVybiBtZXRhdmFyaWFibGVBc3NpZ25lZDtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tTWV0YXZhcmlhYmxlKG1ldGF2YXJpYWJsZSkge1xuICAgIGNvbnN0IG1ldGF2YXJpYWJsZUFzc2lnbm1lbnQgPSBuZXcgTWV0YXZhcmlhYmxlQXNzaWdubWVudChtZXRhdmFyaWFibGUpO1xuXG4gICAgcmV0dXJuIG1ldGF2YXJpYWJsZUFzc2lnbm1lbnQ7XG4gIH1cbn1cbiJdLCJuYW1lcyI6WyJNZXRhdmFyaWFibGVBc3NpZ25tZW50IiwibWV0YXZhcmlhYmxlIiwiZ2V0TWV0YXZhcmlhYmxlIiwiYXNzaWduIiwiZmlsZUNvbnRleHQiLCJtZXRhdmFyaWFibGVBZGRlZCIsImFkZE1ldGF2YXJpYWJsZSIsIm1ldGF2YXJpYWJsZU5vZGUiLCJnZXROb2RlIiwibWV0YXZhcmlhYmxlU3RyaW5nIiwibm9kZUFzU3RyaW5nIiwibWV0YXZhcmlhYmxlQXNzaWduZWQiLCJ0cmFjZSIsImRlYnVnIiwiZnJvbU1ldGF2YXJpYWJsZSIsIm1ldGF2YXJpYWJsZUFzc2lnbm1lbnQiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7O2VBRXFCQTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFOLElBQUEsQUFBTUEsdUNBQU47YUFBTUEsdUJBQ1BDLFlBQVk7Z0NBRExEO1FBRWpCLElBQUksQ0FBQ0MsWUFBWSxHQUFHQTs7a0JBRkhEOztZQUtuQkUsS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLE9BQU8sSUFBSSxDQUFDRCxZQUFZO1lBQzFCOzs7WUFFQUUsS0FBQUE7bUJBQUFBLFNBQUFBLE9BQU9DLFdBQVc7Z0JBQ2hCLElBQU1DLG9CQUFvQkQsWUFBWUUsZUFBZSxDQUFDLElBQUksQ0FBQ0wsWUFBWSxHQUNqRU0sbUJBQW1CLElBQUksQ0FBQ04sWUFBWSxDQUFDTyxPQUFPLElBQzVDQyxxQkFBcUJMLFlBQVlNLFlBQVksQ0FBQ0gsbUJBQzlDSSx1QkFBdUJOLG1CQUFtQixHQUFHO2dCQUVuRE0sdUJBQ0VQLFlBQVlRLEtBQUssQ0FBQyxBQUFDLGlCQUFtQyxPQUFuQkgsb0JBQW1CLHNCQUNwREwsWUFBWVMsS0FBSyxDQUFDLEFBQUMseUJBQTJDLE9BQW5CSixvQkFBbUI7Z0JBRWxFLE9BQU9FO1lBQ1Q7Ozs7WUFFT0csS0FBQUE7bUJBQVAsU0FBT0EsaUJBQWlCYixZQUFZO2dCQUNsQyxJQUFNYyx5QkFBeUIsSUF2QmRmLHVCQXVCeUNDO2dCQUUxRCxPQUFPYztZQUNUOzs7V0ExQm1CZiJ9

package/lib/combinator.js

@@ -8,7 +8,9 @@ Object.defineProperty(exports, "default", {
         return Combinator;
     }
 });
-var _string = require("./utilities/string");
+var _shim = /*#__PURE__*/ _interop_require_default(require("./shim"));
+var _local = /*#__PURE__*/ _interop_require_default(require("./context/local"));
+var _query = require("./utilities/query");
 function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
@@ -28,39 +30,71 @@ function _create_class(Constructor, protoProps, staticProps) {
     if (staticProps) _defineProperties(Constructor, staticProps);
     return Constructor;
 }
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+var statementNodeQuery = (0, _query.nodeQuery)("/combinatorDeclaration/statement");
 var Combinator = /*#__PURE__*/ function() {
-    function Combinator(statementNode, string) {
+    function Combinator(statement) {
         _class_call_check(this, Combinator);
-        this.statementNode = statementNode;
-        this.string = string;
+        this.statement = statement;
     }
     _create_class(Combinator, [
         {
-            key: "getStatementNode",
-            value: function getStatementNode() {
-                return this.statementNode;
+            key: "getStatement",
+            value: function getStatement() {
+                return this.statement;
             }
         },
         {
             key: "getString",
             value: function getString() {
-                return this.string;
+                return this.statement.getString();
+            }
+        },
+        {
+            key: "getStatementNode",
+            value: function getStatementNode() {
+                var statementNode = this.statement.getNode();
+                return statementNode;
+            }
+        },
+        {
+            key: "verify",
+            value: function verify(fileContext) {
+                var localContext = _local.default.fromFileContext(fileContext), statementVerifiedAsCombinator = this.statement.verifyAsCombinator(localContext), verified = statementVerifiedAsCombinator; ///
+                return verified;
+            }
+        },
+        {
+            key: "toJSON",
+            value: function toJSON() {
+                var statementString = this.statement.getString(), statement = statementString, json = {
+                    statement: statement
+                };
+                return json;
             }
         }
     ], [
         {
-            key: "fromStatementNodeAndTokens",
-            value: function fromStatementNodeAndTokens(statementNode, tokens) {
-                var string = stringFromStatementNodeAndTokens(statementNode, tokens), combinator = new Combinator(statementNode, string);
+            key: "fromJSON",
+            value: function fromJSON(json, fileContext) {
+                var combinator = null;
+                debugger;
+                return combinator;
+            }
+        },
+        {
+            key: "fromCombinatorDeclarationNode",
+            value: function fromCombinatorDeclarationNode(combinatorDeclarationNode, fileContext) {
+                var Statement = _shim.default.Statement, statementNode = statementNodeQuery(combinatorDeclarationNode), localContext = _local.default.fromFileContext(fileContext), statement = Statement.fromStatementNode(statementNode, localContext), combinator = new Combinator(statement);
                 return combinator;
             }
         }
     ]);
     return Combinator;
 }();
-function stringFromStatementNodeAndTokens(statementNode, tokens) {
-    var statementString = (0, _string.nodeAsString)(statementNode, tokens), string = statementString; ///
-    return string;
-}
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb21iaW5hdG9yLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBub2RlQXNTdHJpbmcgfSBmcm9tIFwiLi91dGlsaXRpZXMvc3RyaW5nXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIENvbWJpbmF0b3Ige1xuICBjb25zdHJ1Y3RvcihzdGF0ZW1lbnROb2RlLCBzdHJpbmcpIHtcbiAgICB0aGlzLnN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnROb2RlO1xuICAgIHRoaXMuc3RyaW5nID0gc3RyaW5nO1xuICB9XG5cbiAgZ2V0U3RhdGVtZW50Tm9kZSgpIHtcbiAgICByZXR1cm4gdGhpcy5zdGF0ZW1lbnROb2RlO1xuICB9XG5cbiAgZ2V0U3RyaW5nKCkge1xuICAgIHJldHVybiB0aGlzLnN0cmluZztcbiAgfVxuXG4gIHN0YXRpYyBmcm9tU3RhdGVtZW50Tm9kZUFuZFRva2VucyhzdGF0ZW1lbnROb2RlLCB0b2tlbnMpIHtcbiAgICBjb25zdCBzdHJpbmcgPSBzdHJpbmdGcm9tU3RhdGVtZW50Tm9kZUFuZFRva2VucyhzdGF0ZW1lbnROb2RlLCB0b2tlbnMpLFxuICAgICAgICAgIGNvbWJpbmF0b3IgPSBuZXcgQ29tYmluYXRvcihzdGF0ZW1lbnROb2RlLCBzdHJpbmcpO1xuXG4gICAgcmV0dXJuIGNvbWJpbmF0b3I7XG4gIH1cbn1cblxuZnVuY3Rpb24gc3RyaW5nRnJvbVN0YXRlbWVudE5vZGVBbmRUb2tlbnMoc3RhdGVtZW50Tm9kZSwgdG9rZW5zKSB7XG4gIGNvbnN0IHN0YXRlbWVudFN0cmluZyA9IG5vZGVBc1N0cmluZyhzdGF0ZW1lbnROb2RlLCB0b2tlbnMpLFxuICAgICAgICBzdHJpbmcgPSBzdGF0ZW1lbnRTdHJpbmc7IC8vL1xuXG4gIHJldHVybiBzdHJpbmc7XG59XG4iXSwibmFtZXMiOlsiQ29tYmluYXRvciIsInN0YXRlbWVudE5vZGUiLCJzdHJpbmciLCJnZXRTdGF0ZW1lbnROb2RlIiwiZ2V0U3RyaW5nIiwiZnJvbVN0YXRlbWVudE5vZGVBbmRUb2tlbnMiLCJ0b2tlbnMiLCJzdHJpbmdGcm9tU3RhdGVtZW50Tm9kZUFuZFRva2VucyIsImNvbWJpbmF0b3IiLCJzdGF0ZW1lbnRTdHJpbmciLCJub2RlQXNTdHJpbmciXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7O2VBSXFCQTs7O3NCQUZROzs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVkLElBQUEsQUFBTUEsMkJBQU47YUFBTUEsV0FDUEMsYUFBYSxFQUFFQyxNQUFNO2dDQURkRjtRQUVqQixJQUFJLENBQUNDLGFBQWEsR0FBR0E7UUFDckIsSUFBSSxDQUFDQyxNQUFNLEdBQUdBOztrQkFIR0Y7O1lBTW5CRyxLQUFBQTttQkFBQUEsU0FBQUE7Z0JBQ0UsT0FBTyxJQUFJLENBQUNGLGFBQWE7WUFDM0I7OztZQUVBRyxLQUFBQTttQkFBQUEsU0FBQUE7Z0JBQ0UsT0FBTyxJQUFJLENBQUNGLE1BQU07WUFDcEI7Ozs7WUFFT0csS0FBQUE7bUJBQVAsU0FBT0EsMkJBQTJCSixhQUFhLEVBQUVLLE1BQU07Z0JBQ3JELElBQU1KLFNBQVNLLGlDQUFpQ04sZUFBZUssU0FDekRFLGFBQWEsSUFoQkZSLFdBZ0JpQkMsZUFBZUM7Z0JBRWpELE9BQU9NO1lBQ1Q7OztXQW5CbUJSOztBQXNCckIsU0FBU08saUNBQWlDTixhQUFhLEVBQUVLLE1BQU07SUFDN0QsSUFBTUcsa0JBQWtCQyxJQUFBQSxvQkFBWSxFQUFDVCxlQUFlSyxTQUM5Q0osU0FBU08saUJBQWlCLEdBQUc7SUFFbkMsT0FBT1A7QUFDVCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb21iaW5hdG9yLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgc2hpbSBmcm9tIFwiLi9zaGltXCI7XG5pbXBvcnQgTG9jYWxDb250ZXh0IGZyb20gXCIuL2NvbnRleHQvbG9jYWxcIjtcblxuaW1wb3J0IHsgbm9kZVF1ZXJ5IH0gZnJvbSBcIi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5cbmNvbnN0IHN0YXRlbWVudE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9jb21iaW5hdG9yRGVjbGFyYXRpb24vc3RhdGVtZW50XCIpO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBDb21iaW5hdG9yIHtcbiAgY29uc3RydWN0b3Ioc3RhdGVtZW50KSB7XG4gICAgdGhpcy5zdGF0ZW1lbnQgPSBzdGF0ZW1lbnQ7XG4gIH1cblxuICBnZXRTdGF0ZW1lbnQoKSB7XG4gICAgcmV0dXJuIHRoaXMuc3RhdGVtZW50O1xuICB9XG5cbiAgZ2V0U3RyaW5nKCkgeyByZXR1cm4gdGhpcy5zdGF0ZW1lbnQuZ2V0U3RyaW5nKCk7IH1cblxuICBnZXRTdGF0ZW1lbnROb2RlKCkge1xuICAgIGNvbnN0IHN0YXRlbWVudE5vZGUgPSB0aGlzLnN0YXRlbWVudC5nZXROb2RlKCk7XG5cbiAgICByZXR1cm4gc3RhdGVtZW50Tm9kZTtcbiAgfVxuXG4gIHZlcmlmeShmaWxlQ29udGV4dCkge1xuICAgIGNvbnN0IGxvY2FsQ29udGV4dCA9IExvY2FsQ29udGV4dC5mcm9tRmlsZUNvbnRleHQoZmlsZUNvbnRleHQpLFxuICAgICAgICAgIHN0YXRlbWVudFZlcmlmaWVkQXNDb21iaW5hdG9yID0gdGhpcy5zdGF0ZW1lbnQudmVyaWZ5QXNDb21iaW5hdG9yKGxvY2FsQ29udGV4dCksXG4gICAgICAgICAgdmVyaWZpZWQgPSBzdGF0ZW1lbnRWZXJpZmllZEFzQ29tYmluYXRvcjsgLy8vXG5cbiAgICByZXR1cm4gdmVyaWZpZWQ7XG4gIH1cblxuICB0b0pTT04oKSB7XG4gICAgY29uc3Qgc3RhdGVtZW50U3RyaW5nID0gdGhpcy5zdGF0ZW1lbnQuZ2V0U3RyaW5nKCksXG4gICAgICAgICAgc3RhdGVtZW50ID0gc3RhdGVtZW50U3RyaW5nLCAgLy8vXG4gICAgICAgICAganNvbiA9IHtcbiAgICAgICAgICAgIHN0YXRlbWVudFxuICAgICAgICAgIH07XG5cbiAgICByZXR1cm4ganNvbjtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tSlNPTihqc29uLCBmaWxlQ29udGV4dCkge1xuICAgIGxldCBjb21iaW5hdG9yID0gbnVsbDtcblxuICAgIGRlYnVnZ2VyXG5cbiAgICByZXR1cm4gY29tYmluYXRvcjtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tQ29tYmluYXRvckRlY2xhcmF0aW9uTm9kZShjb21iaW5hdG9yRGVjbGFyYXRpb25Ob2RlLCBmaWxlQ29udGV4dCkge1xuICAgIGNvbnN0IHsgU3RhdGVtZW50IH0gPSBzaGltLFxuICAgICAgICAgIHN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnROb2RlUXVlcnkoY29tYmluYXRvckRlY2xhcmF0aW9uTm9kZSksXG4gICAgICAgICAgbG9jYWxDb250ZXh0ID0gTG9jYWxDb250ZXh0LmZyb21GaWxlQ29udGV4dChmaWxlQ29udGV4dCksXG4gICAgICAgICAgc3RhdGVtZW50ID0gU3RhdGVtZW50LmZyb21TdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUsIGxvY2FsQ29udGV4dCksXG4gICAgICAgICAgY29tYmluYXRvciA9IG5ldyBDb21iaW5hdG9yKHN0YXRlbWVudCk7XG5cbiAgICByZXR1cm4gY29tYmluYXRvcjtcbiAgfVxufVxuIl0sIm5hbWVzIjpbIkNvbWJpbmF0b3IiLCJzdGF0ZW1lbnROb2RlUXVlcnkiLCJub2RlUXVlcnkiLCJzdGF0ZW1lbnQiLCJnZXRTdGF0ZW1lbnQiLCJnZXRTdHJpbmciLCJnZXRTdGF0ZW1lbnROb2RlIiwic3RhdGVtZW50Tm9kZSIsImdldE5vZGUiLCJ2ZXJpZnkiLCJmaWxlQ29udGV4dCIsImxvY2FsQ29udGV4dCIsIkxvY2FsQ29udGV4dCIsImZyb21GaWxlQ29udGV4dCIsInN0YXRlbWVudFZlcmlmaWVkQXNDb21iaW5hdG9yIiwidmVyaWZ5QXNDb21iaW5hdG9yIiwidmVyaWZpZWQiLCJ0b0pTT04iLCJzdGF0ZW1lbnRTdHJpbmciLCJqc29uIiwiZnJvbUpTT04iLCJjb21iaW5hdG9yIiwiZnJvbUNvbWJpbmF0b3JEZWNsYXJhdGlvbk5vZGUiLCJjb21iaW5hdG9yRGVjbGFyYXRpb25Ob2RlIiwiU3RhdGVtZW50Iiwic2hpbSIsImZyb21TdGF0ZW1lbnROb2RlIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztlQVNxQkE7OzsyREFQSjs0REFDUTtxQkFFQzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUUxQixJQUFNQyxxQkFBcUJDLElBQUFBLGdCQUFTLEVBQUM7QUFFdEIsSUFBQSxBQUFNRiwyQkFBTjthQUFNQSxXQUNQRyxTQUFTO2dDQURGSDtRQUVqQixJQUFJLENBQUNHLFNBQVMsR0FBR0E7O2tCQUZBSDs7WUFLbkJJLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxPQUFPLElBQUksQ0FBQ0QsU0FBUztZQUN2Qjs7O1lBRUFFLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFBYyxPQUFPLElBQUksQ0FBQ0YsU0FBUyxDQUFDRSxTQUFTO1lBQUk7OztZQUVqREMsS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLElBQU1DLGdCQUFnQixJQUFJLENBQUNKLFNBQVMsQ0FBQ0ssT0FBTztnQkFFNUMsT0FBT0Q7WUFDVDs7O1lBRUFFLEtBQUFBO21CQUFBQSxTQUFBQSxPQUFPQyxXQUFXO2dCQUNoQixJQUFNQyxlQUFlQyxjQUFZLENBQUNDLGVBQWUsQ0FBQ0gsY0FDNUNJLGdDQUFnQyxJQUFJLENBQUNYLFNBQVMsQ0FBQ1ksa0JBQWtCLENBQUNKLGVBQ2xFSyxXQUFXRiwrQkFBK0IsR0FBRztnQkFFbkQsT0FBT0U7WUFDVDs7O1lBRUFDLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxJQUFNQyxrQkFBa0IsSUFBSSxDQUFDZixTQUFTLENBQUNFLFNBQVMsSUFDMUNGLFlBQVllLGlCQUNaQyxPQUFPO29CQUNMaEIsV0FBQUE7Z0JBQ0Y7Z0JBRU4sT0FBT2dCO1lBQ1Q7Ozs7WUFFT0MsS0FBQUE7bUJBQVAsU0FBT0EsU0FBU0QsSUFBSSxFQUFFVCxXQUFXO2dCQUMvQixJQUFJVyxhQUFhO2dCQUVqQixRQUFRO2dCQUVSLE9BQU9BO1lBQ1Q7OztZQUVPQyxLQUFBQTttQkFBUCxTQUFPQSw4QkFBOEJDLHlCQUF5QixFQUFFYixXQUFXO2dCQUN6RSxJQUFNLEFBQUVjLFlBQWNDLGFBQUksQ0FBbEJELFdBQ0ZqQixnQkFBZ0JOLG1CQUFtQnNCLDRCQUNuQ1osZUFBZUMsY0FBWSxDQUFDQyxlQUFlLENBQUNILGNBQzVDUCxZQUFZcUIsVUFBVUUsaUJBQWlCLENBQUNuQixlQUFlSSxlQUN2RFUsYUFBYSxJQWhERnJCLFdBZ0RpQkc7Z0JBRWxDLE9BQU9rQjtZQUNUOzs7V0FuRG1CckIifQ==

package/lib/conclusion.js

@@ -8,7 +8,11 @@ Object.defineProperty(exports, "default", {
         return Conclusion;
     }
 });
+var _local = /*#__PURE__*/ _interop_require_default(require("./context/local"));
 var _metaLevel = /*#__PURE__*/ _interop_require_default(require("./unifier/metaLevel"));
+var _unqualified = /*#__PURE__*/ _interop_require_default(require("./statement/unqualified"));
+var _string = require("./utilities/string");
+var _query = require("./utilities/query");
 function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
@@ -33,34 +37,90 @@ function _interop_require_default(obj) {
         default: obj
     };
 }
+var unqualifiedStatementNodeQuery = (0, _query.nodeQuery)("/conclusion/unqualifiedStatement");
 var Conclusion = /*#__PURE__*/ function() {
-    function Conclusion(statementNode) {
+    function Conclusion(fileContext, unqualifiedStatement) {
         _class_call_check(this, Conclusion);
-        this.statementNode = statementNode;
+        this.fileContext = fileContext;
+        this.unqualifiedStatement = unqualifiedStatement;
     }
     _create_class(Conclusion, [
         {
-            key: "getStatementNode",
-            value: function getStatementNode() {
-                return this.statementNode;
+            key: "getFileContext",
+            value: function getFileContext() {
+                return this.fileContext;
+            }
+        },
+        {
+            key: "getUnqualifiedStatement",
+            value: function getUnqualifiedStatement() {
+                return this.unqualifiedStatement;
+            }
+        },
+        {
+            key: "getString",
+            value: function getString() {
+                return this.unqualifiedStatement.getString();
+            }
+        },
+        {
+            key: "getStatement",
+            value: function getStatement() {
+                return this.unqualifiedStatement.getStatement();
             }
         },
         {
             key: "unifyStatement",
-            value: function unifyStatement(statementNodeB, substitutions, localContextA, localContextB) {
-                var statementUnified = false;
-                if (this.statementNode !== null) {
-                    var nodeA = this.statementNode, nodeB = statementNodeB, unified = _metaLevel.default.unify(nodeA, nodeB, substitutions, localContextA, localContextB);
-                    statementUnified = unified; ///
+            value: function unifyStatement(statement, substitutions, localContext) {
+                var statementUnified;
+                var conclusion = this, statementString = statement.getString(), conclusionStatement = conclusion.getStatement(), conclusionStatementString = conclusionStatement.getString();
+                localContext.trace("Unifying the '".concat(statementString, "' statement with the conclusion's '").concat(conclusionStatementString, "' statement..."));
+                var statementNode = statement.getNode(), conclusionStatementNode = conclusionStatement.getNode(), nodeA = conclusionStatementNode, nodeB = statementNode, fileContextA = this.fileContext, localContextA = _local.default.fromFileContext(fileContextA), localContextB = localContext, unified = _metaLevel.default.unify(nodeA, nodeB, substitutions, localContextA, localContextB);
+                statementUnified = unified; ///
+                if (statementUnified) {
+                    localContext.debug("...unified the '".concat(statementString, "' statement with the conclusion's '").concat(conclusionStatementString, "' statement."));
                 }
                 return statementUnified;
             }
+        },
+        {
+            key: "verify",
+            value: function verify(localContext) {
+                var verified = false, conclusionString = this.getString(); ///
+                conclusionString = (0, _string.trim)(conclusionString); ///
+                localContext.trace("Verifying the '".concat(conclusionString, "' conclusion..."));
+                var stated = true, assignments = [], unqualifiedStatementVerified = this.unqualifiedStatement.verify(assignments, stated, localContext);
+                if (unqualifiedStatementVerified) {
+                    verified = true;
+                }
+                if (verified) {
+                    localContext.debug("...verified the '".concat(conclusionString, "' conclusion."));
+                }
+                return verified;
+            }
+        },
+        {
+            key: "toJSON",
+            value: function toJSON() {
+                var unqualifiedStatementString = this.unqualifiedStatement.getString(), unqualifiedStatement = unqualifiedStatementString, json = {
+                    unqualifiedStatement: unqualifiedStatement
+                };
+                return json;
+            }
         }
     ], [
         {
-            key: "fromStatementNode",
-            value: function fromStatementNode(statementNode) {
-                var conclusion = new Conclusion(statementNode);
+            key: "fromJSON",
+            value: function fromJSON(json, fileContext) {
+                var conclusion = null;
+                debugger;
+                return conclusion;
+            }
+        },
+        {
+            key: "fromConclusionNode",
+            value: function fromConclusionNode(conclusionNode, fileContext) {
+                var unqualifiedStatementNode = unqualifiedStatementNodeQuery(conclusionNode), unqualifiedStatement = _unqualified.default.fromUnqualifiedStatementNode(unqualifiedStatementNode, fileContext), conclusion = new Conclusion(fileContext, unqualifiedStatement);
                 return conclusion;
             }
         }
@@ -68,4 +128,4 @@ var Conclusion = /*#__PURE__*/ function() {
     return Conclusion;
 }();
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25jbHVzaW9uLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgbWV0YUxldmVsVW5pZmllciBmcm9tIFwiLi91bmlmaWVyL21ldGFMZXZlbFwiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBDb25jbHVzaW9uIHtcbiAgY29uc3RydWN0b3Ioc3RhdGVtZW50Tm9kZSkge1xuICAgIHRoaXMuc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudE5vZGU7XG4gIH1cblxuICBnZXRTdGF0ZW1lbnROb2RlKCkge1xuICAgIHJldHVybiB0aGlzLnN0YXRlbWVudE5vZGU7XG4gIH1cblxuICB1bmlmeVN0YXRlbWVudChzdGF0ZW1lbnROb2RlQiwgc3Vic3RpdHV0aW9ucywgbG9jYWxDb250ZXh0QSwgbG9jYWxDb250ZXh0Qikge1xuICAgIGxldCBzdGF0ZW1lbnRVbmlmaWVkID0gZmFsc2U7XG5cbiAgICBpZiAodGhpcy5zdGF0ZW1lbnROb2RlICE9PSBudWxsKSB7XG4gICAgICBjb25zdCBub2RlQSA9IHRoaXMuc3RhdGVtZW50Tm9kZSwgIC8vL1xuICAgICAgICAgICAgbm9kZUIgPSBzdGF0ZW1lbnROb2RlQiwgIC8vL1xuICAgICAgICAgICAgdW5pZmllZCA9IG1ldGFMZXZlbFVuaWZpZXIudW5pZnkobm9kZUEsIG5vZGVCLCBzdWJzdGl0dXRpb25zLCBsb2NhbENvbnRleHRBLCBsb2NhbENvbnRleHRCKTtcblxuICAgICAgc3RhdGVtZW50VW5pZmllZCA9IHVuaWZpZWQ7IC8vL1xuICAgIH1cblxuICAgIHJldHVybiBzdGF0ZW1lbnRVbmlmaWVkO1xuICB9XG5cbiAgc3RhdGljIGZyb21TdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUpIHtcbiAgICBjb25zdCBjb25jbHVzaW9uID0gbmV3IENvbmNsdXNpb24oc3RhdGVtZW50Tm9kZSk7XG5cbiAgICByZXR1cm4gY29uY2x1c2lvbjtcbiAgfVxufVxuIl0sIm5hbWVzIjpbIkNvbmNsdXNpb24iLCJzdGF0ZW1lbnROb2RlIiwiZ2V0U3RhdGVtZW50Tm9kZSIsInVuaWZ5U3RhdGVtZW50Iiwic3RhdGVtZW50Tm9kZUIiLCJzdWJzdGl0dXRpb25zIiwibG9jYWxDb250ZXh0QSIsImxvY2FsQ29udGV4dEIiLCJzdGF0ZW1lbnRVbmlmaWVkIiwibm9kZUEiLCJub2RlQiIsInVuaWZpZWQiLCJtZXRhTGV2ZWxVbmlmaWVyIiwidW5pZnkiLCJmcm9tU3RhdGVtZW50Tm9kZSIsImNvbmNsdXNpb24iXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7O2VBSXFCQTs7O2dFQUZROzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRWQsSUFBQSxBQUFNQSwyQkFBTjthQUFNQSxXQUNQQyxhQUFhO2dDQURORDtRQUVqQixJQUFJLENBQUNDLGFBQWEsR0FBR0E7O2tCQUZKRDs7WUFLbkJFLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxPQUFPLElBQUksQ0FBQ0QsYUFBYTtZQUMzQjs7O1lBRUFFLEtBQUFBO21CQUFBQSxTQUFBQSxlQUFlQyxjQUFjLEVBQUVDLGFBQWEsRUFBRUMsYUFBYSxFQUFFQyxhQUFhO2dCQUN4RSxJQUFJQyxtQkFBbUI7Z0JBRXZCLElBQUksSUFBSSxDQUFDUCxhQUFhLEtBQUssTUFBTTtvQkFDL0IsSUFBTVEsUUFBUSxJQUFJLENBQUNSLGFBQWEsRUFDMUJTLFFBQVFOLGdCQUNSTyxVQUFVQyxrQkFBZ0IsQ0FBQ0MsS0FBSyxDQUFDSixPQUFPQyxPQUFPTCxlQUFlQyxlQUFlQztvQkFFbkZDLG1CQUFtQkcsU0FBUyxHQUFHO2dCQUNqQztnQkFFQSxPQUFPSDtZQUNUOzs7O1lBRU9NLEtBQUFBO21CQUFQLFNBQU9BLGtCQUFrQmIsYUFBYTtnQkFDcEMsSUFBTWMsYUFBYSxJQXhCRmYsV0F3QmlCQztnQkFFbEMsT0FBT2M7WUFDVDs7O1dBM0JtQmYifQ==
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/conclusion.js"],"sourcesContent":["\"use strict\";\n\nimport LocalContext from \"./context/local\";\nimport metaLevelUnifier from \"./unifier/metaLevel\";\nimport UnqualifiedStatement from \"./statement/unqualified\";\n\nimport { trim } from \"./utilities/string\";\nimport { nodeQuery } from \"./utilities/query\";\n\nconst unqualifiedStatementNodeQuery = nodeQuery(\"/conclusion/unqualifiedStatement\");\n\nexport default class Conclusion {\n  constructor(fileContext, unqualifiedStatement) {\n    this.fileContext = fileContext;\n    this.unqualifiedStatement = unqualifiedStatement;\n  }\n\n  getFileContext() {\n    return this.fileContext;\n  }\n\n  getUnqualifiedStatement() {\n    return this.unqualifiedStatement;\n  }\n\n  getString() { return this.unqualifiedStatement.getString(); }\n\n  getStatement() { return this.unqualifiedStatement.getStatement(); }\n\n  unifyStatement(statement, substitutions, localContext) {\n    let statementUnified;\n\n    const conclusion = this, ///\n          statementString = statement.getString(),\n          conclusionStatement = conclusion.getStatement(),\n          conclusionStatementString = conclusionStatement.getString();\n\n    localContext.trace(`Unifying the '${statementString}' statement with the conclusion's '${conclusionStatementString}' statement...`);\n\n    const statementNode = statement.getNode(),\n          conclusionStatementNode = conclusionStatement.getNode(),\n          nodeA = conclusionStatementNode,  ///\n          nodeB = statementNode,  ///\n          fileContextA = this.fileContext,  ///\n          localContextA = LocalContext.fromFileContext(fileContextA),\n          localContextB = localContext, ///\n          unified = metaLevelUnifier.unify(nodeA, nodeB, substitutions, localContextA, localContextB);\n\n    statementUnified = unified; ///\n\n    if (statementUnified) {\n      localContext.debug(`...unified the '${statementString}' statement with the conclusion's '${conclusionStatementString}' statement.`);\n    }\n\n    return statementUnified;\n  }\n\n  verify(localContext) {\n    let verified = false,\n        conclusionString = this.getString();  ///\n\n    conclusionString = trim(conclusionString);  ///\n\n    localContext.trace(`Verifying the '${conclusionString}' conclusion...`);\n\n    const stated = true,\n          assignments = [],\n          unqualifiedStatementVerified = this.unqualifiedStatement.verify(assignments, stated, localContext);\n\n    if (unqualifiedStatementVerified) {\n      verified = true;\n    }\n\n    if (verified) {\n      localContext.debug(`...verified the '${conclusionString}' conclusion.`);\n    }\n\n    return verified;\n  }\n\n  toJSON() {\n    const unqualifiedStatementString = this.unqualifiedStatement.getString(),\n          unqualifiedStatement = unqualifiedStatementString,  ///\n          json = {\n            unqualifiedStatement\n          };\n\n    return json;\n  }\n\n  static fromJSON(json, fileContext) {\n    let conclusion = null;\n\n    debugger\n\n    return conclusion;\n  }\n  static fromConclusionNode(conclusionNode, fileContext) {\n    const unqualifiedStatementNode = unqualifiedStatementNodeQuery(conclusionNode),\n          unqualifiedStatement = UnqualifiedStatement.fromUnqualifiedStatementNode(unqualifiedStatementNode, fileContext),\n          conclusion = new Conclusion(fileContext, unqualifiedStatement);\n\n    return conclusion;\n  }\n}\n"],"names":["Conclusion","unqualifiedStatementNodeQuery","nodeQuery","fileContext","unqualifiedStatement","getFileContext","getUnqualifiedStatement","getString","getStatement","unifyStatement","statement","substitutions","localContext","statementUnified","conclusion","statementString","conclusionStatement","conclusionStatementString","trace","statementNode","getNode","conclusionStatementNode","nodeA","nodeB","fileContextA","localContextA","LocalContext","fromFileContext","localContextB","unified","metaLevelUnifier","unify","debug","verify","verified","conclusionString","trim","stated","assignments","unqualifiedStatementVerified","toJSON","unqualifiedStatementString","json","fromJSON","fromConclusionNode","conclusionNode","unqualifiedStatementNode","UnqualifiedStatement","fromUnqualifiedStatementNode"],"mappings":"AAAA;;;;;;;eAWqBA;;;4DATI;gEACI;kEACI;sBAEZ;qBACK;;;;;;;;;;;;;;;;;;;;;;;;;AAE1B,IAAMC,gCAAgCC,IAAAA,gBAAS,EAAC;AAEjC,IAAA,AAAMF,2BAAN;aAAMA,WACPG,WAAW,EAAEC,oBAAoB;gCAD1BJ;QAEjB,IAAI,CAACG,WAAW,GAAGA;QACnB,IAAI,CAACC,oBAAoB,GAAGA;;kBAHXJ;;YAMnBK,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACF,WAAW;YACzB;;;YAEAG,KAAAA;mBAAAA,SAAAA;gBACE,OAAO,IAAI,CAACF,oBAAoB;YAClC;;;YAEAG,KAAAA;mBAAAA,SAAAA;gBAAc,OAAO,IAAI,CAACH,oBAAoB,CAACG,SAAS;YAAI;;;YAE5DC,KAAAA;mBAAAA,SAAAA;gBAAiB,OAAO,IAAI,CAACJ,oBAAoB,CAACI,YAAY;YAAI;;;YAElEC,KAAAA;mBAAAA,SAAAA,eAAeC,SAAS,EAAEC,aAAa,EAAEC,YAAY;gBACnD,IAAIC;gBAEJ,IAAMC,aAAa,IAAI,EACjBC,kBAAkBL,UAAUH,SAAS,IACrCS,sBAAsBF,WAAWN,YAAY,IAC7CS,4BAA4BD,oBAAoBT,SAAS;gBAE/DK,aAAaM,KAAK,CAAC,AAAC,iBAAqED,OAArDF,iBAAgB,uCAA+D,OAA1BE,2BAA0B;gBAEnH,IAAME,gBAAgBT,UAAUU,OAAO,IACjCC,0BAA0BL,oBAAoBI,OAAO,IACrDE,QAAQD,yBACRE,QAAQJ,eACRK,eAAe,IAAI,CAACrB,WAAW,EAC/BsB,gBAAgBC,cAAY,CAACC,eAAe,CAACH,eAC7CI,gBAAgBhB,cAChBiB,UAAUC,kBAAgB,CAACC,KAAK,CAACT,OAAOC,OAAOZ,eAAec,eAAeG;gBAEnFf,mBAAmBgB,SAAS,GAAG;gBAE/B,IAAIhB,kBAAkB;oBACpBD,aAAaoB,KAAK,CAAC,AAAC,mBAAuEf,OAArDF,iBAAgB,uCAA+D,OAA1BE,2BAA0B;gBACvH;gBAEA,OAAOJ;YACT;;;YAEAoB,KAAAA;mBAAAA,SAAAA,OAAOrB,YAAY;gBACjB,IAAIsB,WAAW,OACXC,mBAAmB,IAAI,CAAC5B,SAAS,IAAK,GAAG;gBAE7C4B,mBAAmBC,IAAAA,YAAI,EAACD,mBAAoB,GAAG;gBAE/CvB,aAAaM,KAAK,CAAC,AAAC,kBAAkC,OAAjBiB,kBAAiB;gBAEtD,IAAME,SAAS,MACTC,cAAc,EAAE,EAChBC,+BAA+B,IAAI,CAACnC,oBAAoB,CAAC6B,MAAM,CAACK,aAAaD,QAAQzB;gBAE3F,IAAI2B,8BAA8B;oBAChCL,WAAW;gBACb;gBAEA,IAAIA,UAAU;oBACZtB,aAAaoB,KAAK,CAAC,AAAC,oBAAoC,OAAjBG,kBAAiB;gBAC1D;gBAEA,OAAOD;YACT;;;YAEAM,KAAAA;mBAAAA,SAAAA;gBACE,IAAMC,6BAA6B,IAAI,CAACrC,oBAAoB,CAACG,SAAS,IAChEH,uBAAuBqC,4BACvBC,OAAO;oBACLtC,sBAAAA;gBACF;gBAEN,OAAOsC;YACT;;;;YAEOC,KAAAA;mBAAP,SAAOA,SAASD,IAAI,EAAEvC,WAAW;gBAC/B,IAAIW,aAAa;gBAEjB,QAAQ;gBAER,OAAOA;YACT;;;YACO8B,KAAAA;mBAAP,SAAOA,mBAAmBC,cAAc,EAAE1C,WAAW;gBACnD,IAAM2C,2BAA2B7C,8BAA8B4C,iBACzDzC,uBAAuB2C,oBAAoB,CAACC,4BAA4B,CAACF,0BAA0B3C,cACnGW,aAAa,IAzFFd,WAyFiBG,aAAaC;gBAE/C,OAAOU;YACT;;;WA5FmBd"}