occam-verify-cli 0.0.1005 → 0.0.1007

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -40,10 +40,23 @@ function verifyAction(argument, log) {
40
40
  return;
41
41
  }
42
42
 
43
+ const releaseName = name, ///
44
+ releaseContext = releaseContextMap[releaseName],
45
+ released = releaseContext.isReleased();
46
+
47
+ if (released) {
48
+ log.warning(`The '${name}' package does not need to be verified.`);
49
+
50
+ stopClock(now, log);
51
+
52
+ return;
53
+ }
54
+
43
55
  initialiseReleaseContext(dependency, context);
44
56
 
45
- const releaseName = name, ///
46
- releaseVerified = verifyRelease(releaseName, releaseContextMap);
57
+ const dependentName = null,
58
+ dependentReleased = false,
59
+ releaseVerified = verifyRelease(releaseName, dependentName, dependentReleased, releaseContextMap);
47
60
 
48
61
  if (!releaseVerified) {
49
62
  log.warning(`The '${name}' project or package context cannot be verified.`);
@@ -64,14 +64,19 @@ function releaseContextFromJSON(json, context) {
64
64
  const { log } = context,
65
65
  { name } = json;
66
66
 
67
+ ({context} = json); ///
68
+
67
69
  let { entries } = json;
68
70
 
69
71
  json = entries; ///
70
72
 
71
73
  entries = Entries.fromJSON(json);
72
74
 
73
- const released = true,
74
- releaseContext = ReleaseContext.fromLogNameEntriesAndReleased(log, name, entries, released);
75
+ const contextJSON = context; ///
76
+
77
+ json = contextJSON; ///
78
+
79
+ const releaseContext = ReleaseContext.fromLogNameJSONAndEntries(log, name, json, entries);
75
80
 
76
81
  return releaseContext;
77
82
  }
@@ -87,10 +92,10 @@ function releaseContextFromProject(project, context) {
87
92
  if (metaJSONFileValid) {
88
93
  const { log } = context,
89
94
  name = project.getName(),
90
- entries = project.getEntries(),
91
- released = false;
95
+ json = null,
96
+ entries = project.getEntries();
92
97
 
93
- releaseContext = ReleaseContext.fromLogNameEntriesAndReleased(log, name, entries, released);
98
+ releaseContext = ReleaseContext.fromLogNameJSONAndEntries(log, name, json, entries);
94
99
  }
95
100
  }
96
101
 
package/lib/combinator.js CHANGED
@@ -9,8 +9,10 @@ Object.defineProperty(exports, "default", {
9
9
  }
10
10
  });
11
11
  var _shim = /*#__PURE__*/ _interop_require_default(require("./shim"));
12
+ var _statement = /*#__PURE__*/ _interop_require_default(require("./statement"));
12
13
  var _local = /*#__PURE__*/ _interop_require_default(require("./context/local"));
13
14
  var _query = require("./utilities/query");
15
+ var _node = require("./utilities/node");
14
16
  function _class_call_check(instance, Constructor) {
15
17
  if (!(instance instanceof Constructor)) {
16
18
  throw new TypeError("Cannot call a class as a function");
@@ -81,8 +83,10 @@ var Combinator = /*#__PURE__*/ function() {
81
83
  {
82
84
  key: "fromJSON",
83
85
  value: function fromJSON(json, fileContext) {
84
- var combinator = null;
85
- debugger;
86
+ var statement = json.statement;
87
+ var lexer = fileContext.getLexer(), parser = fileContext.getParser(), statementString = statement, statementNode = (0, _node.statementNodeFromStatementString)(statementString, lexer, parser), localContext = _local.default.fromFileContext(fileContext);
88
+ statement = _statement.default.fromStatementNode(statementNode, localContext);
89
+ var combinator = new Combinator(statement);
86
90
  return combinator;
87
91
  }
88
92
  },
@@ -97,4 +101,4 @@ var Combinator = /*#__PURE__*/ function() {
97
101
  return Combinator;
98
102
  }();
99
103
 
100
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb21iaW5hdG9yLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgc2hpbSBmcm9tIFwiLi9zaGltXCI7XG5pbXBvcnQgTG9jYWxDb250ZXh0IGZyb20gXCIuL2NvbnRleHQvbG9jYWxcIjtcblxuaW1wb3J0IHsgbm9kZVF1ZXJ5IH0gZnJvbSBcIi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5cbmNvbnN0IHN0YXRlbWVudE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9jb21iaW5hdG9yRGVjbGFyYXRpb24vc3RhdGVtZW50XCIpO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBDb21iaW5hdG9yIHtcbiAgY29uc3RydWN0b3Ioc3RhdGVtZW50KSB7XG4gICAgdGhpcy5zdGF0ZW1lbnQgPSBzdGF0ZW1lbnQ7XG4gIH1cblxuICBnZXRTdGF0ZW1lbnQoKSB7XG4gICAgcmV0dXJuIHRoaXMuc3RhdGVtZW50O1xuICB9XG5cbiAgZ2V0U3RyaW5nKCkgeyByZXR1cm4gdGhpcy5zdGF0ZW1lbnQuZ2V0U3RyaW5nKCk7IH1cblxuICBnZXRTdGF0ZW1lbnROb2RlKCkge1xuICAgIGNvbnN0IHN0YXRlbWVudE5vZGUgPSB0aGlzLnN0YXRlbWVudC5nZXROb2RlKCk7XG5cbiAgICByZXR1cm4gc3RhdGVtZW50Tm9kZTtcbiAgfVxuXG4gIHZlcmlmeShmaWxlQ29udGV4dCkge1xuICAgIGNvbnN0IGxvY2FsQ29udGV4dCA9IExvY2FsQ29udGV4dC5mcm9tRmlsZUNvbnRleHQoZmlsZUNvbnRleHQpLFxuICAgICAgICAgIHN0YXRlbWVudFZlcmlmaWVkQXNDb21iaW5hdG9yID0gdGhpcy5zdGF0ZW1lbnQudmVyaWZ5QXNDb21iaW5hdG9yKGxvY2FsQ29udGV4dCksXG4gICAgICAgICAgdmVyaWZpZWQgPSBzdGF0ZW1lbnRWZXJpZmllZEFzQ29tYmluYXRvcjsgLy8vXG5cbiAgICByZXR1cm4gdmVyaWZpZWQ7XG4gIH1cblxuICB0b0pTT04oKSB7XG4gICAgY29uc3Qgc3RhdGVtZW50U3RyaW5nID0gdGhpcy5zdGF0ZW1lbnQuZ2V0U3RyaW5nKCksXG4gICAgICAgICAgc3RhdGVtZW50ID0gc3RhdGVtZW50U3RyaW5nLCAgLy8vXG4gICAgICAgICAganNvbiA9IHtcbiAgICAgICAgICAgIHN0YXRlbWVudFxuICAgICAgICAgIH07XG5cbiAgICByZXR1cm4ganNvbjtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tSlNPTihqc29uLCBmaWxlQ29udGV4dCkge1xuICAgIGxldCBjb21iaW5hdG9yID0gbnVsbDtcblxuICAgIGRlYnVnZ2VyXG5cbiAgICByZXR1cm4gY29tYmluYXRvcjtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tQ29tYmluYXRvckRlY2xhcmF0aW9uTm9kZShjb21iaW5hdG9yRGVjbGFyYXRpb25Ob2RlLCBmaWxlQ29udGV4dCkge1xuICAgIGNvbnN0IHsgU3RhdGVtZW50IH0gPSBzaGltLFxuICAgICAgICAgIHN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnROb2RlUXVlcnkoY29tYmluYXRvckRlY2xhcmF0aW9uTm9kZSksXG4gICAgICAgICAgbG9jYWxDb250ZXh0ID0gTG9jYWxDb250ZXh0LmZyb21GaWxlQ29udGV4dChmaWxlQ29udGV4dCksXG4gICAgICAgICAgc3RhdGVtZW50ID0gU3RhdGVtZW50LmZyb21TdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUsIGxvY2FsQ29udGV4dCksXG4gICAgICAgICAgY29tYmluYXRvciA9IG5ldyBDb21iaW5hdG9yKHN0YXRlbWVudCk7XG5cbiAgICByZXR1cm4gY29tYmluYXRvcjtcbiAgfVxufVxuIl0sIm5hbWVzIjpbIkNvbWJpbmF0b3IiLCJzdGF0ZW1lbnROb2RlUXVlcnkiLCJub2RlUXVlcnkiLCJzdGF0ZW1lbnQiLCJnZXRTdGF0ZW1lbnQiLCJnZXRTdHJpbmciLCJnZXRTdGF0ZW1lbnROb2RlIiwic3RhdGVtZW50Tm9kZSIsImdldE5vZGUiLCJ2ZXJpZnkiLCJmaWxlQ29udGV4dCIsImxvY2FsQ29udGV4dCIsIkxvY2FsQ29udGV4dCIsImZyb21GaWxlQ29udGV4dCIsInN0YXRlbWVudFZlcmlmaWVkQXNDb21iaW5hdG9yIiwidmVyaWZ5QXNDb21iaW5hdG9yIiwidmVyaWZpZWQiLCJ0b0pTT04iLCJzdGF0ZW1lbnRTdHJpbmciLCJqc29uIiwiZnJvbUpTT04iLCJjb21iaW5hdG9yIiwiZnJvbUNvbWJpbmF0b3JEZWNsYXJhdGlvbk5vZGUiLCJjb21iaW5hdG9yRGVjbGFyYXRpb25Ob2RlIiwiU3RhdGVtZW50Iiwic2hpbSIsImZyb21TdGF0ZW1lbnROb2RlIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztlQVNxQkE7OzsyREFQSjs0REFDUTtxQkFFQzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUUxQixJQUFNQyxxQkFBcUJDLElBQUFBLGdCQUFTLEVBQUM7QUFFdEIsSUFBQSxBQUFNRiwyQkFBTjthQUFNQSxXQUNQRyxTQUFTO2dDQURGSDtRQUVqQixJQUFJLENBQUNHLFNBQVMsR0FBR0E7O2tCQUZBSDs7WUFLbkJJLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxPQUFPLElBQUksQ0FBQ0QsU0FBUztZQUN2Qjs7O1lBRUFFLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFBYyxPQUFPLElBQUksQ0FBQ0YsU0FBUyxDQUFDRSxTQUFTO1lBQUk7OztZQUVqREMsS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLElBQU1DLGdCQUFnQixJQUFJLENBQUNKLFNBQVMsQ0FBQ0ssT0FBTztnQkFFNUMsT0FBT0Q7WUFDVDs7O1lBRUFFLEtBQUFBO21CQUFBQSxTQUFBQSxPQUFPQyxXQUFXO2dCQUNoQixJQUFNQyxlQUFlQyxjQUFZLENBQUNDLGVBQWUsQ0FBQ0gsY0FDNUNJLGdDQUFnQyxJQUFJLENBQUNYLFNBQVMsQ0FBQ1ksa0JBQWtCLENBQUNKLGVBQ2xFSyxXQUFXRiwrQkFBK0IsR0FBRztnQkFFbkQsT0FBT0U7WUFDVDs7O1lBRUFDLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxJQUFNQyxrQkFBa0IsSUFBSSxDQUFDZixTQUFTLENBQUNFLFNBQVMsSUFDMUNGLFlBQVllLGlCQUNaQyxPQUFPO29CQUNMaEIsV0FBQUE7Z0JBQ0Y7Z0JBRU4sT0FBT2dCO1lBQ1Q7Ozs7WUFFT0MsS0FBQUE7bUJBQVAsU0FBT0EsU0FBU0QsSUFBSSxFQUFFVCxXQUFXO2dCQUMvQixJQUFJVyxhQUFhO2dCQUVqQixRQUFRO2dCQUVSLE9BQU9BO1lBQ1Q7OztZQUVPQyxLQUFBQTttQkFBUCxTQUFPQSw4QkFBOEJDLHlCQUF5QixFQUFFYixXQUFXO2dCQUN6RSxJQUFNLEFBQUVjLFlBQWNDLGFBQUksQ0FBbEJELFdBQ0ZqQixnQkFBZ0JOLG1CQUFtQnNCLDRCQUNuQ1osZUFBZUMsY0FBWSxDQUFDQyxlQUFlLENBQUNILGNBQzVDUCxZQUFZcUIsVUFBVUUsaUJBQWlCLENBQUNuQixlQUFlSSxlQUN2RFUsYUFBYSxJQWhERnJCLFdBZ0RpQkc7Z0JBRWxDLE9BQU9rQjtZQUNUOzs7V0FuRG1CckIifQ==
104
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb21iaW5hdG9yLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgc2hpbSBmcm9tIFwiLi9zaGltXCI7XG5pbXBvcnQgU3RhdGVtZW50IGZyb20gXCIuL3N0YXRlbWVudFwiO1xuaW1wb3J0IExvY2FsQ29udGV4dCBmcm9tIFwiLi9jb250ZXh0L2xvY2FsXCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuL3V0aWxpdGllcy9xdWVyeVwiO1xuaW1wb3J0IHsgc3RhdGVtZW50Tm9kZUZyb21TdGF0ZW1lbnRTdHJpbmcgfSBmcm9tIFwiLi91dGlsaXRpZXMvbm9kZVwiO1xuXG5jb25zdCBzdGF0ZW1lbnROb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvY29tYmluYXRvckRlY2xhcmF0aW9uL3N0YXRlbWVudFwiKTtcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgQ29tYmluYXRvciB7XG4gIGNvbnN0cnVjdG9yKHN0YXRlbWVudCkge1xuICAgIHRoaXMuc3RhdGVtZW50ID0gc3RhdGVtZW50O1xuICB9XG5cbiAgZ2V0U3RhdGVtZW50KCkge1xuICAgIHJldHVybiB0aGlzLnN0YXRlbWVudDtcbiAgfVxuXG4gIGdldFN0cmluZygpIHsgcmV0dXJuIHRoaXMuc3RhdGVtZW50LmdldFN0cmluZygpOyB9XG5cbiAgZ2V0U3RhdGVtZW50Tm9kZSgpIHtcbiAgICBjb25zdCBzdGF0ZW1lbnROb2RlID0gdGhpcy5zdGF0ZW1lbnQuZ2V0Tm9kZSgpO1xuXG4gICAgcmV0dXJuIHN0YXRlbWVudE5vZGU7XG4gIH1cblxuICB2ZXJpZnkoZmlsZUNvbnRleHQpIHtcbiAgICBjb25zdCBsb2NhbENvbnRleHQgPSBMb2NhbENvbnRleHQuZnJvbUZpbGVDb250ZXh0KGZpbGVDb250ZXh0KSxcbiAgICAgICAgICBzdGF0ZW1lbnRWZXJpZmllZEFzQ29tYmluYXRvciA9IHRoaXMuc3RhdGVtZW50LnZlcmlmeUFzQ29tYmluYXRvcihsb2NhbENvbnRleHQpLFxuICAgICAgICAgIHZlcmlmaWVkID0gc3RhdGVtZW50VmVyaWZpZWRBc0NvbWJpbmF0b3I7IC8vL1xuXG4gICAgcmV0dXJuIHZlcmlmaWVkO1xuICB9XG5cbiAgdG9KU09OKCkge1xuICAgIGNvbnN0IHN0YXRlbWVudFN0cmluZyA9IHRoaXMuc3RhdGVtZW50LmdldFN0cmluZygpLFxuICAgICAgICAgIHN0YXRlbWVudCA9IHN0YXRlbWVudFN0cmluZywgIC8vL1xuICAgICAgICAgIGpzb24gPSB7XG4gICAgICAgICAgICBzdGF0ZW1lbnRcbiAgICAgICAgICB9O1xuXG4gICAgcmV0dXJuIGpzb247XG4gIH1cblxuICBzdGF0aWMgZnJvbUpTT04oanNvbiwgZmlsZUNvbnRleHQpIHtcbiAgICBsZXQgeyBzdGF0ZW1lbnQgfSA9IGpzb247XG5cbiAgICBjb25zdCBsZXhlciA9IGZpbGVDb250ZXh0LmdldExleGVyKCksXG4gICAgICAgICAgcGFyc2VyID0gZmlsZUNvbnRleHQuZ2V0UGFyc2VyKCksXG4gICAgICAgICAgc3RhdGVtZW50U3RyaW5nID0gc3RhdGVtZW50LCAgLy8vXG4gICAgICAgICAgc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudE5vZGVGcm9tU3RhdGVtZW50U3RyaW5nKHN0YXRlbWVudFN0cmluZywgbGV4ZXIsIHBhcnNlciksXG4gICAgICAgICAgbG9jYWxDb250ZXh0ID0gTG9jYWxDb250ZXh0LmZyb21GaWxlQ29udGV4dChmaWxlQ29udGV4dCk7XG5cbiAgICBzdGF0ZW1lbnQgPSBTdGF0ZW1lbnQuZnJvbVN0YXRlbWVudE5vZGUoc3RhdGVtZW50Tm9kZSwgbG9jYWxDb250ZXh0KTtcblxuICAgIGNvbnN0IGNvbWJpbmF0b3IgPSBuZXcgQ29tYmluYXRvcihzdGF0ZW1lbnQpO1xuXG4gICAgcmV0dXJuIGNvbWJpbmF0b3I7XG4gIH1cblxuICBzdGF0aWMgZnJvbUNvbWJpbmF0b3JEZWNsYXJhdGlvbk5vZGUoY29tYmluYXRvckRlY2xhcmF0aW9uTm9kZSwgZmlsZUNvbnRleHQpIHtcbiAgICBjb25zdCB7IFN0YXRlbWVudCB9ID0gc2hpbSxcbiAgICAgICAgICBzdGF0ZW1lbnROb2RlID0gc3RhdGVtZW50Tm9kZVF1ZXJ5KGNvbWJpbmF0b3JEZWNsYXJhdGlvbk5vZGUpLFxuICAgICAgICAgIGxvY2FsQ29udGV4dCA9IExvY2FsQ29udGV4dC5mcm9tRmlsZUNvbnRleHQoZmlsZUNvbnRleHQpLFxuICAgICAgICAgIHN0YXRlbWVudCA9IFN0YXRlbWVudC5mcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlLCBsb2NhbENvbnRleHQpLFxuICAgICAgICAgIGNvbWJpbmF0b3IgPSBuZXcgQ29tYmluYXRvcihzdGF0ZW1lbnQpO1xuXG4gICAgcmV0dXJuIGNvbWJpbmF0b3I7XG4gIH1cbn1cbiJdLCJuYW1lcyI6WyJDb21iaW5hdG9yIiwic3RhdGVtZW50Tm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5Iiwic3RhdGVtZW50IiwiZ2V0U3RhdGVtZW50IiwiZ2V0U3RyaW5nIiwiZ2V0U3RhdGVtZW50Tm9kZSIsInN0YXRlbWVudE5vZGUiLCJnZXROb2RlIiwidmVyaWZ5IiwiZmlsZUNvbnRleHQiLCJsb2NhbENvbnRleHQiLCJMb2NhbENvbnRleHQiLCJmcm9tRmlsZUNvbnRleHQiLCJzdGF0ZW1lbnRWZXJpZmllZEFzQ29tYmluYXRvciIsInZlcmlmeUFzQ29tYmluYXRvciIsInZlcmlmaWVkIiwidG9KU09OIiwic3RhdGVtZW50U3RyaW5nIiwianNvbiIsImZyb21KU09OIiwibGV4ZXIiLCJnZXRMZXhlciIsInBhcnNlciIsImdldFBhcnNlciIsInN0YXRlbWVudE5vZGVGcm9tU3RhdGVtZW50U3RyaW5nIiwiU3RhdGVtZW50IiwiZnJvbVN0YXRlbWVudE5vZGUiLCJjb21iaW5hdG9yIiwiZnJvbUNvbWJpbmF0b3JEZWNsYXJhdGlvbk5vZGUiLCJjb21iaW5hdG9yRGVjbGFyYXRpb25Ob2RlIiwic2hpbSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7ZUFXcUJBOzs7MkRBVEo7Z0VBQ0s7NERBQ0c7cUJBRUM7b0JBQ3VCOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRWpELElBQU1DLHFCQUFxQkMsSUFBQUEsZ0JBQVMsRUFBQztBQUV0QixJQUFBLEFBQU1GLDJCQUFOO2FBQU1BLFdBQ1BHLFNBQVM7Z0NBREZIO1FBRWpCLElBQUksQ0FBQ0csU0FBUyxHQUFHQTs7a0JBRkFIOztZQUtuQkksS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLE9BQU8sSUFBSSxDQUFDRCxTQUFTO1lBQ3ZCOzs7WUFFQUUsS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUFjLE9BQU8sSUFBSSxDQUFDRixTQUFTLENBQUNFLFNBQVM7WUFBSTs7O1lBRWpEQyxLQUFBQTttQkFBQUEsU0FBQUE7Z0JBQ0UsSUFBTUMsZ0JBQWdCLElBQUksQ0FBQ0osU0FBUyxDQUFDSyxPQUFPO2dCQUU1QyxPQUFPRDtZQUNUOzs7WUFFQUUsS0FBQUE7bUJBQUFBLFNBQUFBLE9BQU9DLFdBQVc7Z0JBQ2hCLElBQU1DLGVBQWVDLGNBQVksQ0FBQ0MsZUFBZSxDQUFDSCxjQUM1Q0ksZ0NBQWdDLElBQUksQ0FBQ1gsU0FBUyxDQUFDWSxrQkFBa0IsQ0FBQ0osZUFDbEVLLFdBQVdGLCtCQUErQixHQUFHO2dCQUVuRCxPQUFPRTtZQUNUOzs7WUFFQUMsS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLElBQU1DLGtCQUFrQixJQUFJLENBQUNmLFNBQVMsQ0FBQ0UsU0FBUyxJQUMxQ0YsWUFBWWUsaUJBQ1pDLE9BQU87b0JBQ0xoQixXQUFBQTtnQkFDRjtnQkFFTixPQUFPZ0I7WUFDVDs7OztZQUVPQyxLQUFBQTttQkFBUCxTQUFPQSxTQUFTRCxJQUFJLEVBQUVULFdBQVc7Z0JBQy9CLElBQUksQUFBRVAsWUFBY2dCLEtBQWRoQjtnQkFFTixJQUFNa0IsUUFBUVgsWUFBWVksUUFBUSxJQUM1QkMsU0FBU2IsWUFBWWMsU0FBUyxJQUM5Qk4sa0JBQWtCZixXQUNsQkksZ0JBQWdCa0IsSUFBQUEsc0NBQWdDLEVBQUNQLGlCQUFpQkcsT0FBT0UsU0FDekVaLGVBQWVDLGNBQVksQ0FBQ0MsZUFBZSxDQUFDSDtnQkFFbERQLFlBQVl1QixrQkFBUyxDQUFDQyxpQkFBaUIsQ0FBQ3BCLGVBQWVJO2dCQUV2RCxJQUFNaUIsYUFBYSxJQTlDRjVCLFdBOENpQkc7Z0JBRWxDLE9BQU95QjtZQUNUOzs7WUFFT0MsS0FBQUE7bUJBQVAsU0FBT0EsOEJBQThCQyx5QkFBeUIsRUFBRXBCLFdBQVc7Z0JBQ3pFLElBQU0sQUFBRWdCLFlBQWNLLGFBQUksQ0FBbEJMLFdBQ0ZuQixnQkFBZ0JOLG1CQUFtQjZCLDRCQUNuQ25CLGVBQWVDLGNBQVksQ0FBQ0MsZUFBZSxDQUFDSCxjQUM1Q1AsWUFBWXVCLFVBQVVDLGlCQUFpQixDQUFDcEIsZUFBZUksZUFDdkRpQixhQUFhLElBeERGNUIsV0F3RGlCRztnQkFFbEMsT0FBT3lCO1lBQ1Q7OztXQTNEbUI1QiJ9
package/lib/conclusion.js CHANGED
@@ -8,10 +8,12 @@ Object.defineProperty(exports, "default", {
8
8
  return Conclusion;
9
9
  }
10
10
  });
11
+ var _local = /*#__PURE__*/ _interop_require_default(require("./context/local"));
11
12
  var _metaLevel = /*#__PURE__*/ _interop_require_default(require("./unifier/metaLevel"));
12
13
  var _unqualified = /*#__PURE__*/ _interop_require_default(require("./statement/unqualified"));
14
+ var _string = require("./utilities/string");
13
15
  var _query = require("./utilities/query");
14
- var _local = /*#__PURE__*/ _interop_require_default(require("./context/local"));
16
+ var _node = require("./utilities/node");
15
17
  function _class_call_check(instance, Constructor) {
16
18
  if (!(instance instanceof Constructor)) {
17
19
  throw new TypeError("Cannot call a class as a function");
@@ -85,8 +87,8 @@ var Conclusion = /*#__PURE__*/ function() {
85
87
  {
86
88
  key: "verify",
87
89
  value: function verify(localContext) {
88
- var verified = false;
89
- var conclusionString = this.getString(); ///
90
+ var verified = false, conclusionString = this.getString(); ///
91
+ conclusionString = (0, _string.trim)(conclusionString); ///
90
92
  localContext.trace("Verifying the '".concat(conclusionString, "' conclusion..."));
91
93
  var stated = true, assignments = [], unqualifiedStatementVerified = this.unqualifiedStatement.verify(assignments, stated, localContext);
92
94
  if (unqualifiedStatementVerified) {
@@ -111,8 +113,10 @@ var Conclusion = /*#__PURE__*/ function() {
111
113
  {
112
114
  key: "fromJSON",
113
115
  value: function fromJSON(json, fileContext) {
114
- var conclusion = null;
115
- debugger;
116
+ var unqualifiedStatement = json.unqualifiedStatement;
117
+ var lexer = fileContext.getLexer(), parser = fileContext.getParser(), unqualifiedStatementString = unqualifiedStatement, unqualifiedStatementNode = (0, _node.unqualifiedStatementNodeFromUnqualifiedStatementString)(unqualifiedStatementString, lexer, parser);
118
+ unqualifiedStatement = _unqualified.default.fromUnqualifiedStatementNode(unqualifiedStatementNode, fileContext);
119
+ var conclusion = new Conclusion(fileContext, unqualifiedStatement);
116
120
  return conclusion;
117
121
  }
118
122
  },
@@ -127,4 +131,4 @@ var Conclusion = /*#__PURE__*/ function() {
127
131
  return Conclusion;
128
132
  }();
129
133
 
130
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/conclusion.js"],"sourcesContent":["\"use strict\";\n\nimport metaLevelUnifier from \"./unifier/metaLevel\";\nimport UnqualifiedStatement from \"./statement/unqualified\";\n\nimport { nodeQuery } from \"./utilities/query\";\nimport LocalContext from \"./context/local\";\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\n    const conclusionString = this.getString();  ///\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","stated","assignments","unqualifiedStatementVerified","toJSON","unqualifiedStatementString","json","fromJSON","fromConclusionNode","conclusionNode","unqualifiedStatementNode","UnqualifiedStatement","fromUnqualifiedStatementNode"],"mappings":"AAAA;;;;;;;eAUqBA;;;gEARQ;kEACI;qBAEP;4DACD;;;;;;;;;;;;;;;;;;;;;;;;;AAEzB,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;gBAEf,IAAMC,mBAAmB,IAAI,CAAC5B,SAAS,IAAK,GAAG;gBAE/CK,aAAaM,KAAK,CAAC,AAAC,kBAAkC,OAAjBiB,kBAAiB;gBAEtD,IAAMC,SAAS,MACTC,cAAc,EAAE,EAChBC,+BAA+B,IAAI,CAAClC,oBAAoB,CAAC6B,MAAM,CAACI,aAAaD,QAAQxB;gBAE3F,IAAI0B,8BAA8B;oBAChCJ,WAAW;gBACb;gBAEA,IAAIA,UAAU;oBACZtB,aAAaoB,KAAK,CAAC,AAAC,oBAAoC,OAAjBG,kBAAiB;gBAC1D;gBAEA,OAAOD;YACT;;;YAEAK,KAAAA;mBAAAA,SAAAA;gBACE,IAAMC,6BAA6B,IAAI,CAACpC,oBAAoB,CAACG,SAAS,IAChEH,uBAAuBoC,4BACvBC,OAAO;oBACLrC,sBAAAA;gBACF;gBAEN,OAAOqC;YACT;;;;YAEOC,KAAAA;mBAAP,SAAOA,SAASD,IAAI,EAAEtC,WAAW;gBAC/B,IAAIW,aAAa;gBAEjB,QAAQ;gBAER,OAAOA;YACT;;;YACO6B,KAAAA;mBAAP,SAAOA,mBAAmBC,cAAc,EAAEzC,WAAW;gBACnD,IAAM0C,2BAA2B5C,8BAA8B2C,iBACzDxC,uBAAuB0C,oBAAoB,CAACC,4BAA4B,CAACF,0BAA0B1C,cACnGW,aAAa,IAxFFd,WAwFiBG,aAAaC;gBAE/C,OAAOU;YACT;;;WA3FmBd"}
134
+ //# 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\";\nimport { unqualifiedStatementNodeFromUnqualifiedStatementString } from \"./utilities/node\";\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 { unqualifiedStatement } = json;\n\n    const lexer = fileContext.getLexer(),\n          parser = fileContext.getParser(),\n          unqualifiedStatementString = unqualifiedStatement,  ///\n          unqualifiedStatementNode = unqualifiedStatementNodeFromUnqualifiedStatementString(unqualifiedStatementString, lexer, parser);\n\n    unqualifiedStatement = UnqualifiedStatement.fromUnqualifiedStatementNode(unqualifiedStatementNode, fileContext);\n\n    const conclusion = new Conclusion(fileContext, unqualifiedStatement);\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","lexer","getLexer","parser","getParser","unqualifiedStatementNode","unqualifiedStatementNodeFromUnqualifiedStatementString","UnqualifiedStatement","fromUnqualifiedStatementNode","fromConclusionNode","conclusionNode"],"mappings":"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"}