occam-verify-cli 0.0.1086 → 0.0.1087

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.
Files changed (3) hide show
  1. package/lib/utilities/subproof.js +8 -3
  2. package/package.json +2 -2
  3. package/src/utilities/subproof.js +14 -7
package/lib/utilities/subproof.js CHANGED
@@ -10,10 +10,15 @@ Object.defineProperty(exports, "subproofStringFromSubproofNode", {
10
10
  });
11
11
  var _query = require("./query");
12
12
  var _string = require("./string");
13
- var subproofSuppositionStatementNodesQuery = (0, _query.nodesQuery)("/subproof/supposition/unqualifiedStatement/statement"), subproofLastProofStepStatementNodeQuery = (0, _query.nodeQuery)("/subproof/subDerivation/lastProofStep/unqualifiedStatement|qualifiedStatement/statement");
13
+ var suppositionStatementNodesQuery = (0, _query.nodesQuery)("/subproof/supposition/unqualifiedStatement/statement"), lastProofStepStatementNodeQuery = (0, _query.nodeQuery)("/subproof/subDerivation/lastProofStep/unqualifiedStatement|qualifiedStatement/statement");
14
14
  function subproofStringFromSubproofNode(subproofNode, fileContext) {
15
- var tokens = fileContext.getTokens(), subproofSuppositionStatementNodes = subproofSuppositionStatementNodesQuery(subproofNode), subproofLastProofStepStatementNode = subproofLastProofStepStatementNodeQuery(subproofNode), subproofSuppositionStatementsString = (0, _string.nodesAsString)(subproofSuppositionStatementNodes, tokens), subproofLastProofStepStatementString = (0, _string.nodeAsString)(subproofLastProofStepStatementNode, tokens), subproofString = "[".concat(subproofSuppositionStatementsString, "]...").concat(subproofLastProofStepStatementString);
15
+ var subproofString = null;
16
+ var tokens = fileContext.getTokens(), suppositionStatementNodes = suppositionStatementNodesQuery(subproofNode), lastProofStepStatementNode = lastProofStepStatementNodeQuery(subproofNode), suppositionStatementNodesLength = suppositionStatementNodes.length;
17
+ if (lastProofStepStatementNode !== null && suppositionStatementNodesLength) {
18
+ var suppositionStatementsString = (0, _string.nodesAsString)(suppositionStatementNodes, tokens), lastProofStepStatementString = (0, _string.nodeAsString)(lastProofStepStatementNode, tokens);
19
+ subproofString = "[".concat(suppositionStatementsString, "]...").concat(lastProofStepStatementString);
20
+ }
16
21
  return subproofString;
17
22
  }
18
23
 
19
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvc3VicHJvb2YuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSwgbm9kZXNRdWVyeSB9IGZyb20gXCIuL3F1ZXJ5XCI7XG5pbXBvcnQgeyBub2RlQXNTdHJpbmcsIG5vZGVzQXNTdHJpbmcgfSBmcm9tIFwiLi9zdHJpbmdcIjtcblxuY29uc3Qgc3VicHJvb2ZTdXBwb3NpdGlvblN0YXRlbWVudE5vZGVzUXVlcnkgPSBub2Rlc1F1ZXJ5KFwiL3N1YnByb29mL3N1cHBvc2l0aW9uL3VucXVhbGlmaWVkU3RhdGVtZW50L3N0YXRlbWVudFwiKSxcbiAgICAgIHN1YnByb29mTGFzdFByb29mU3RlcFN0YXRlbWVudE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9zdWJwcm9vZi9zdWJEZXJpdmF0aW9uL2xhc3RQcm9vZlN0ZXAvdW5xdWFsaWZpZWRTdGF0ZW1lbnR8cXVhbGlmaWVkU3RhdGVtZW50L3N0YXRlbWVudFwiKTtcblxuZXhwb3J0IGZ1bmN0aW9uIHN1YnByb29mU3RyaW5nRnJvbVN1YnByb29mTm9kZShzdWJwcm9vZk5vZGUsIGZpbGVDb250ZXh0KSB7XG4gIGNvbnN0IHRva2VucyA9IGZpbGVDb250ZXh0LmdldFRva2VucygpLFxuICAgICAgICBzdWJwcm9vZlN1cHBvc2l0aW9uU3RhdGVtZW50Tm9kZXMgPSBzdWJwcm9vZlN1cHBvc2l0aW9uU3RhdGVtZW50Tm9kZXNRdWVyeShzdWJwcm9vZk5vZGUpLFxuICAgICAgICBzdWJwcm9vZkxhc3RQcm9vZlN0ZXBTdGF0ZW1lbnROb2RlID0gc3VicHJvb2ZMYXN0UHJvb2ZTdGVwU3RhdGVtZW50Tm9kZVF1ZXJ5KHN1YnByb29mTm9kZSksXG4gICAgICAgIHN1YnByb29mU3VwcG9zaXRpb25TdGF0ZW1lbnRzU3RyaW5nID0gbm9kZXNBc1N0cmluZyhzdWJwcm9vZlN1cHBvc2l0aW9uU3RhdGVtZW50Tm9kZXMsIHRva2VucyksXG4gICAgICAgIHN1YnByb29mTGFzdFByb29mU3RlcFN0YXRlbWVudFN0cmluZyA9IG5vZGVBc1N0cmluZyhzdWJwcm9vZkxhc3RQcm9vZlN0ZXBTdGF0ZW1lbnROb2RlLCB0b2tlbnMpLFxuICAgICAgICBzdWJwcm9vZlN0cmluZyA9IGBbJHtzdWJwcm9vZlN1cHBvc2l0aW9uU3RhdGVtZW50c1N0cmluZ31dLi4uJHtzdWJwcm9vZkxhc3RQcm9vZlN0ZXBTdGF0ZW1lbnRTdHJpbmd9YDtcblxuICByZXR1cm4gc3VicHJvb2ZTdHJpbmc7XG59XG4iXSwibmFtZXMiOlsic3VicHJvb2ZTdHJpbmdGcm9tU3VicHJvb2ZOb2RlIiwic3VicHJvb2ZTdXBwb3NpdGlvblN0YXRlbWVudE5vZGVzUXVlcnkiLCJub2Rlc1F1ZXJ5Iiwic3VicHJvb2ZMYXN0UHJvb2ZTdGVwU3RhdGVtZW50Tm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5Iiwic3VicHJvb2ZOb2RlIiwiZmlsZUNvbnRleHQiLCJ0b2tlbnMiLCJnZXRUb2tlbnMiLCJzdWJwcm9vZlN1cHBvc2l0aW9uU3RhdGVtZW50Tm9kZXMiLCJzdWJwcm9vZkxhc3RQcm9vZlN0ZXBTdGF0ZW1lbnROb2RlIiwic3VicHJvb2ZTdXBwb3NpdGlvblN0YXRlbWVudHNTdHJpbmciLCJub2Rlc0FzU3RyaW5nIiwic3VicHJvb2ZMYXN0UHJvb2ZTdGVwU3RhdGVtZW50U3RyaW5nIiwibm9kZUFzU3RyaW5nIiwic3VicHJvb2ZTdHJpbmciXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVFnQkE7OztlQUFBQTs7O3FCQU5zQjtzQkFDTTtBQUU1QyxJQUFNQyx5Q0FBeUNDLElBQUFBLGlCQUFVLEVBQUMseURBQ3BEQywwQ0FBMENDLElBQUFBLGdCQUFTLEVBQUM7QUFFbkQsU0FBU0osK0JBQStCSyxZQUFZLEVBQUVDLFdBQVc7SUFDdEUsSUFBTUMsU0FBU0QsWUFBWUUsU0FBUyxJQUM5QkMsb0NBQW9DUix1Q0FBdUNJLGVBQzNFSyxxQ0FBcUNQLHdDQUF3Q0UsZUFDN0VNLHNDQUFzQ0MsSUFBQUEscUJBQWEsRUFBQ0gsbUNBQW1DRixTQUN2Rk0sdUNBQXVDQyxJQUFBQSxvQkFBWSxFQUFDSixvQ0FBb0NILFNBQ3hGUSxpQkFBaUIsQUFBQyxJQUE2Q0YsT0FBMUNGLHFDQUFvQyxRQUEyQyxPQUFyQ0U7SUFFckUsT0FBT0U7QUFDVCJ9
24
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvc3VicHJvb2YuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSwgbm9kZXNRdWVyeSB9IGZyb20gXCIuL3F1ZXJ5XCI7XG5pbXBvcnQgeyBub2RlQXNTdHJpbmcsIG5vZGVzQXNTdHJpbmcgfSBmcm9tIFwiLi9zdHJpbmdcIjtcblxuY29uc3Qgc3VwcG9zaXRpb25TdGF0ZW1lbnROb2Rlc1F1ZXJ5ID0gbm9kZXNRdWVyeShcIi9zdWJwcm9vZi9zdXBwb3NpdGlvbi91bnF1YWxpZmllZFN0YXRlbWVudC9zdGF0ZW1lbnRcIiksXG4gICAgICBsYXN0UHJvb2ZTdGVwU3RhdGVtZW50Tm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3N1YnByb29mL3N1YkRlcml2YXRpb24vbGFzdFByb29mU3RlcC91bnF1YWxpZmllZFN0YXRlbWVudHxxdWFsaWZpZWRTdGF0ZW1lbnQvc3RhdGVtZW50XCIpO1xuXG5leHBvcnQgZnVuY3Rpb24gc3VicHJvb2ZTdHJpbmdGcm9tU3VicHJvb2ZOb2RlKHN1YnByb29mTm9kZSwgZmlsZUNvbnRleHQpIHtcbiAgbGV0IHN1YnByb29mU3RyaW5nID0gbnVsbDtcblxuICBjb25zdCB0b2tlbnMgPSBmaWxlQ29udGV4dC5nZXRUb2tlbnMoKSxcbiAgICAgICAgc3VwcG9zaXRpb25TdGF0ZW1lbnROb2RlcyA9IHN1cHBvc2l0aW9uU3RhdGVtZW50Tm9kZXNRdWVyeShzdWJwcm9vZk5vZGUpLFxuICAgICAgICBsYXN0UHJvb2ZTdGVwU3RhdGVtZW50Tm9kZSA9IGxhc3RQcm9vZlN0ZXBTdGF0ZW1lbnROb2RlUXVlcnkoc3VicHJvb2ZOb2RlKSxcbiAgICAgICAgc3VwcG9zaXRpb25TdGF0ZW1lbnROb2Rlc0xlbmd0aCA9IHN1cHBvc2l0aW9uU3RhdGVtZW50Tm9kZXMubGVuZ3RoO1xuXG4gIGlmICgobGFzdFByb29mU3RlcFN0YXRlbWVudE5vZGUgIT09IG51bGwpICYmIChzdXBwb3NpdGlvblN0YXRlbWVudE5vZGVzTGVuZ3RoKSkge1xuICAgIGNvbnN0IHN1cHBvc2l0aW9uU3RhdGVtZW50c1N0cmluZyA9IG5vZGVzQXNTdHJpbmcoc3VwcG9zaXRpb25TdGF0ZW1lbnROb2RlcywgdG9rZW5zKSxcbiAgICAgICAgICBsYXN0UHJvb2ZTdGVwU3RhdGVtZW50U3RyaW5nID0gbm9kZUFzU3RyaW5nKGxhc3RQcm9vZlN0ZXBTdGF0ZW1lbnROb2RlLCB0b2tlbnMpO1xuXG4gICAgc3VicHJvb2ZTdHJpbmcgPSBgWyR7c3VwcG9zaXRpb25TdGF0ZW1lbnRzU3RyaW5nfV0uLi4ke2xhc3RQcm9vZlN0ZXBTdGF0ZW1lbnRTdHJpbmd9YDtcbiAgfVxuXG4gIHJldHVybiBzdWJwcm9vZlN0cmluZztcbn1cbiJdLCJuYW1lcyI6WyJzdWJwcm9vZlN0cmluZ0Zyb21TdWJwcm9vZk5vZGUiLCJzdXBwb3NpdGlvblN0YXRlbWVudE5vZGVzUXVlcnkiLCJub2Rlc1F1ZXJ5IiwibGFzdFByb29mU3RlcFN0YXRlbWVudE5vZGVRdWVyeSIsIm5vZGVRdWVyeSIsInN1YnByb29mTm9kZSIsImZpbGVDb250ZXh0Iiwic3VicHJvb2ZTdHJpbmciLCJ0b2tlbnMiLCJnZXRUb2tlbnMiLCJzdXBwb3NpdGlvblN0YXRlbWVudE5vZGVzIiwibGFzdFByb29mU3RlcFN0YXRlbWVudE5vZGUiLCJzdXBwb3NpdGlvblN0YXRlbWVudE5vZGVzTGVuZ3RoIiwibGVuZ3RoIiwic3VwcG9zaXRpb25TdGF0ZW1lbnRzU3RyaW5nIiwibm9kZXNBc1N0cmluZyIsImxhc3RQcm9vZlN0ZXBTdGF0ZW1lbnRTdHJpbmciLCJub2RlQXNTdHJpbmciXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVFnQkE7OztlQUFBQTs7O3FCQU5zQjtzQkFDTTtBQUU1QyxJQUFNQyxpQ0FBaUNDLElBQUFBLGlCQUFVLEVBQUMseURBQzVDQyxrQ0FBa0NDLElBQUFBLGdCQUFTLEVBQUM7QUFFM0MsU0FBU0osK0JBQStCSyxZQUFZLEVBQUVDLFdBQVc7SUFDdEUsSUFBSUMsaUJBQWlCO0lBRXJCLElBQU1DLFNBQVNGLFlBQVlHLFNBQVMsSUFDOUJDLDRCQUE0QlQsK0JBQStCSSxlQUMzRE0sNkJBQTZCUixnQ0FBZ0NFLGVBQzdETyxrQ0FBa0NGLDBCQUEwQkcsTUFBTTtJQUV4RSxJQUFJLEFBQUNGLCtCQUErQixRQUFVQyxpQ0FBa0M7UUFDOUUsSUFBTUUsOEJBQThCQyxJQUFBQSxxQkFBYSxFQUFDTCwyQkFBMkJGLFNBQ3ZFUSwrQkFBK0JDLElBQUFBLG9CQUFZLEVBQUNOLDRCQUE0Qkg7UUFFOUVELGlCQUFpQixBQUFDLElBQXFDUyxPQUFsQ0YsNkJBQTRCLFFBQW1DLE9BQTdCRTtJQUN6RDtJQUVBLE9BQU9UO0FBQ1QifQ==
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "occam-verify-cli",
3
3
  "author": "James Smith",
4
- "version": "0.0.1086",
4
+ "version": "0.0.1087",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-verify-cli",
7
7
  "description": "Occam's Verifier",
@@ -12,7 +12,7 @@
12
12
  "dependencies": {
13
13
  "argumentative": "^2.0.32",
14
14
  "necessary": "^14.2.1",
15
- "occam-custom-grammars": "^5.0.895",
15
+ "occam-custom-grammars": "^5.0.897",
16
16
  "occam-entities": "^1.0.176",
17
17
  "occam-file-system": "^6.0.214",
18
18
  "occam-grammar-utilities": "^8.0.220",
package/src/utilities/subproof.js CHANGED
@@ -3,16 +3,23 @@
3
3
  import { nodeQuery, nodesQuery } from "./query";
4
4
  import { nodeAsString, nodesAsString } from "./string";
5
5
 
6
- const subproofSuppositionStatementNodesQuery = nodesQuery("/subproof/supposition/unqualifiedStatement/statement"),
7
- subproofLastProofStepStatementNodeQuery = nodeQuery("/subproof/subDerivation/lastProofStep/unqualifiedStatement|qualifiedStatement/statement");
6
+ const suppositionStatementNodesQuery = nodesQuery("/subproof/supposition/unqualifiedStatement/statement"),
7
+ lastProofStepStatementNodeQuery = nodeQuery("/subproof/subDerivation/lastProofStep/unqualifiedStatement|qualifiedStatement/statement");
8
8
 
9
9
  export function subproofStringFromSubproofNode(subproofNode, fileContext) {
10
+ let subproofString = null;
11
+
10
12
  const tokens = fileContext.getTokens(),
11
- subproofSuppositionStatementNodes = subproofSuppositionStatementNodesQuery(subproofNode),
12
- subproofLastProofStepStatementNode = subproofLastProofStepStatementNodeQuery(subproofNode),
13
- subproofSuppositionStatementsString = nodesAsString(subproofSuppositionStatementNodes, tokens),
14
- subproofLastProofStepStatementString = nodeAsString(subproofLastProofStepStatementNode, tokens),
15
- subproofString = `[${subproofSuppositionStatementsString}]...${subproofLastProofStepStatementString}`;
13
+ suppositionStatementNodes = suppositionStatementNodesQuery(subproofNode),
14
+ lastProofStepStatementNode = lastProofStepStatementNodeQuery(subproofNode),
15
+ suppositionStatementNodesLength = suppositionStatementNodes.length;
16
+
17
+ if ((lastProofStepStatementNode !== null) && (suppositionStatementNodesLength)) {
18
+ const suppositionStatementsString = nodesAsString(suppositionStatementNodes, tokens),
19
+ lastProofStepStatementString = nodeAsString(lastProofStepStatementNode, tokens);
20
+
21
+ subproofString = `[${suppositionStatementsString}]...${lastProofStepStatementString}`;
22
+ }
16
23
 
17
24
  return subproofString;
18
25
  }