occam-verify-cli 0.0.1057 → 0.0.1061

package/src/context/release.js

@@ -1,5 +1,7 @@
 "use strict";
 
+import { arrayUtilities } from "necessary";
+
 import FileContext from "./file";
 import topLevelVerifier from "../verifier/topLevel";
 
@@ -7,10 +9,10 @@ import { filePathUtilities } from "occam-entities";
 import { lexersUtilities, parsersUtilities } from "occam-custom-grammars";
 
 import { objectType } from "../type";
-import { tail, push, clear, leftDifference } from "../utilities/array";
 import { customGrammarFromNameAndEntries, combinedCustomGrammarFromReleaseContexts } from "../utilities/customGrammar";
 
 const { isFilePathNominalFilePath } = filePathUtilities,
+      { tail, push, clear, resolve } = arrayUtilities,
       { nominalLexerFromCombinedCustomGrammar } = lexersUtilities,
       { nominalParserFromCombinedCustomGrammar } = parsersUtilities;
 
@@ -79,11 +81,7 @@ export default class ReleaseContext {
     return released;
   }
 
-  findFile(filePath) {
-    const file = this.entries.getFile(filePath);
-
-    return file;
-  }
+  findFile(filePath) { return this.entries.findFile(filePath); }
 
   findFileContext(filePath) {
     const fileContext = this.fileContexts.find((fileContext) => {
@@ -455,7 +453,7 @@ function fileContextsFromJSONAndEntries(json, entries, fileContexts, releaseCont
 
   fileContextsJSON.forEach((fileContextJSON) => {
     const { filePath } = fileContextJSON,
-          file = entries.getFile(filePath),
+          file = entries.findFile(filePath),
           fileContext = FileContext.fromFile(file, releaseContext);
 
     fileContext.initialise(fileContextJSON);
@@ -478,43 +476,14 @@ function fileContextsFromEntries(entries, fileContexts, releaseContext) {
 }
 
 function verifyFileContexts(fileContexts, verifiedFileContexts) {
-  let fileContextsVerified;
-
-  fileContexts = [  ///
-    ...fileContexts
-  ];
-
-  for (;;) {
-    const fileContextsLength = fileContexts.length;
-
-    if (fileContextsLength === 0) {
-      break;
-    }
-
-    let fileContextsVerified = false;
-
-    fileContexts.forEach((fileContext) => {
-      const fileContextVerified = verifyFileContext(fileContext);
-
-      if (fileContextVerified) {
-        const verifiedFileContext = fileContext;  ///
-
-        verifiedFileContexts.push(verifiedFileContext);
-
-        fileContextsVerified = true;
-      }
-    });
-
-    if (!fileContextsVerified) {
-      break;
-    }
-
-    leftDifference(fileContexts, verifiedFileContexts);
-  }
-
-  const fileContextsLength = fileContexts.length;
-
-  fileContextsVerified = (fileContextsLength === 0);
+  const resolved = resolve(fileContexts, verifiedFileContexts, (fileContext) => {
+          const fileContextVerified = verifyFileContext(fileContext);
+
+          if (fileContextVerified) {
+            return true;
+          }
+        }),
+        fileContextsVerified = resolved;  ///
 
   return fileContextsVerified;
 }

package/src/derivation.js

@@ -1,10 +1,13 @@
 "use strict";
 
+import { arrayUtilities } from "necessary";
+
 import shim from "./shim";
 
-import { last } from "./utilities/array";
 import { nodesQuery } from "./utilities/query";
 
+const { last } = arrayUtilities;
+
 const proofStepNodesQuery = nodesQuery("/derivation/proofStep|lastProofStep");
 
 export default class Derivation {

package/src/frame.js

@@ -1,8 +1,11 @@
 "use strict";
 
-import { first } from "./utilities/array";
+import { arrayUtilities } from "necessary";
+
 import { metavariableNameFromMetavariableNode } from "./utilities/name";
 
+const { first } = arrayUtilities;
+
 export default class Frame {
   constructor(declarations, metavariableNodes) {
     this.declarations = declarations;

package/src/rule.js

@@ -1,5 +1,7 @@
 "use strict";
 
+import { arrayUtilities } from "necessary";
+
 import Label from "./label";
 import Proof from "./proof";
 import Premise from "./premise";
@@ -7,9 +9,10 @@ import Conclusion from "./conclusion";
 import LocalContext from "./context/local";
 import Substitutions from "./substitutions";
 
-import { reverse, correlate } from "./utilities/array";
 import { nodeQuery, nodesQuery } from "./utilities/query";
 
+const { reverse, correlate } = arrayUtilities;
+
 const proofNodeQuery = nodeQuery("/rule/proof"),
       labelNodesQuery = nodesQuery("/rule/label"),
       premiseNodesQuery = nodesQuery("/rule/premise"),

package/src/subDerivation.js

@@ -1,10 +1,13 @@
 "use strict";
 
+import { arrayUtilities } from "necessary";
+
 import shim from "./shim";
 
-import { last } from "./utilities/array";
 import { nodesQuery } from "./utilities/query";
 
+const { last } = arrayUtilities;
+
 const proofStepNodesQuery = nodesQuery("/subDerivation/proofStep|lastProofStep");
 
 export default class SubDerivation {

package/src/substitutions.js

@@ -1,7 +1,10 @@
 "use strict";
 
+import { arrayUtilities } from "necessary";
+
 import { EMPTY_STRING } from "./constants";
-import { find, first, prune, compress, rightDifference } from "./utilities/array";
+
+const { find, first, prune, filter, compress } = arrayUtilities;
 
 export default class Substitutions {
   constructor(array, savedArray) {
@@ -286,3 +289,13 @@ export default class Substitutions {
     return substitutions;
   }
 }
+
+function rightDifference(arrayA, arrayB) {
+  filter(arrayB, (elementB) => {
+    const arrayAIncludesElementB = arrayA.includes(elementB);
+
+    if (!arrayAIncludesElementB) {
+      return true;
+    }
+  });
+}

package/src/term.js

@@ -1,14 +1,17 @@
 "use strict";
 
+import { arrayUtilities } from "necessary";
+
 import shim from "./shim";
 import unifyMixins from "./mixins/term/unify";
 import verifyMixins from "./mixins/term/verify";
 import termAsConstructorVerifier from "./verifier/termAsConstructor";
 
-import { filter } from "./utilities/array";
+import { objectType } from "./type";
 import { nodesQuery } from "./utilities/query"
 import { termNodeFromTermString } from "./utilities/node";
-import {objectType} from "./type";
+
+const { filter } = arrayUtilities;
 
 const variableNodesQuery = nodesQuery("//variable");
 

package/src/topLevelAssertion.js

@@ -1,11 +1,13 @@
 "use strict";
 
+import { arrayUtilities } from "necessary";
+
 import Label from "./label";
 import Consequent from "./consequent";
 import Supposition from "./supposition";
 import Substitutions from "./substitutions";
 
-import { reverse, correlate } from "./utilities/array";
+const { reverse, correlate } = arrayUtilities;
 
 export default class TopLevelAssertion {
   constructor(fileContext, labels, suppositions, consequent, proof) {

package/src/utilities/arguments.js

@@ -1,8 +1,11 @@
 "use strict";
 
-import { last } from "./array";
+import { arrayUtilities } from "necessary";
+
 import { FUNCTION } from "../constants";
 
+const { last } = arrayUtilities;
+
 export function isLastRemainingArgumentFunction(remainingArguments) {
   let lastRemainingArgumentFunction = false;
 

package/src/utilities/equivalences.js

@@ -1,8 +1,10 @@
 "use strict";
 
+import { arrayUtilities } from "necessary";
+
 import Equivalence from "../equivalence";
 
-import { push, compress, separate } from "../utilities/array";
+const { push, compress, separate } = arrayUtilities;
 
 export function mergeEquivalences(equivalencesA, equivalencesB, localContext) {
   const typesA = typesFromEquivalences(equivalencesA, localContext),

package/src/utilities/releaseContext.js

@@ -1,6 +1,8 @@
 "use strict";
 
-import { last } from "../utilities/array";
+import { arrayUtilities } from "necessary";
+
+const { last } = arrayUtilities;
 
 export function createReleaseContext(dependency, dependentNames, context, callback) {
   const { log, releaseContextMap } = context,

package/src/utilities/unifier.js

@@ -1,6 +1,8 @@
 "use strict";
 
-import { match } from "../utilities/array";
+import { arrayUtilities } from "necessary";
+
+const { match } = arrayUtilities;
 
 export function terminalNodeMapFromNodes(nodes) {
   const terminalNodeMap = {};

package/src/verify/judgement.js

@@ -1,13 +1,16 @@
 "use strict";
 
+import { arrayUtilities } from "necessary";
+
 import Judgement from "../judgement";
 import verifyFrame from "../verify/frame";
 import verifyDeclaration from "./declaration";
 import JudgementAssignment from "../assignment/judgement";
 
-import { first } from "../utilities/array";
 import { nodeQuery } from "../utilities/query";
 
+const { first } = arrayUtilities;
+
 const frameNodeQuery = nodeQuery("/judgement/frame"),
       declarationNodeQuery = nodeQuery("/judgement/declaration");
 

package/src/verify/metaLemma.js

@@ -1,5 +1,7 @@
 "use strict";
 
+import { arrayUtilities } from "necessary";
+
 import MetaLemma from "../metaLemma";
 // import verifyProof from "../verify/proof";
 import LocalContext from "../context/local";
@@ -7,10 +9,11 @@ import Substitutions from "../substitutions";
 // import verifyConsequent from "../verify/consequent";
 // import verifySuppositions from "../verify/suppositions";
 
-import { first } from "../utilities/array";
 import { EMPTY_STRING } from "../constants";
 import { nodeQuery, nodesQuery } from "../utilities/query";
 
+const { first } = arrayUtilities;
+
 const proofNodeQuery = nodeQuery("/metaLemma/proof!"),
       labelNodesQuery = nodesQuery("/metaLemma/label"),
       consequentNodeQuery = nodeQuery("/metaLemma/consequent!"),

package/src/verify/metatheorem.js

@@ -1,5 +1,7 @@
 "use strict";
 
+import { arrayUtilities } from "necessary";
+
 // import verifyProof from "../verify/proof";
 import Metatheorem from "../metatheorem";
 import LocalContext from "../context/local";
@@ -7,9 +9,10 @@ import Substitutions from "../substitutions";
 // import verifyConsequent from "../verify/consequent";
 // import verifySuppositions from "../verify/suppositions";
 
-import { first } from "../utilities/array";
 import { nodeQuery, nodesQuery } from "../utilities/query";
 
+const { first } = arrayUtilities;
+
 const labelNodesQuery = nodesQuery("/metatheorem/label"),
       proofNodeQuery = nodeQuery("/metatheorem/proof!"),
       consequentNodeQuery = nodeQuery("/metatheorem/consequent!"),

package/lib/utilities/array.js

@@ -1,83 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    clear: function() {
-        return clear;
-    },
-    compress: function() {
-        return compress;
-    },
-    correlate: function() {
-        return correlate;
-    },
-    extract: function() {
-        return extract;
-    },
-    filter: function() {
-        return filter;
-    },
-    find: function() {
-        return find;
-    },
-    first: function() {
-        return first;
-    },
-    front: function() {
-        return front;
-    },
-    last: function() {
-        return last;
-    },
-    leftDifference: function() {
-        return leftDifference;
-    },
-    match: function() {
-        return match;
-    },
-    prune: function() {
-        return prune;
-    },
-    push: function() {
-        return push;
-    },
-    reverse: function() {
-        return reverse;
-    },
-    rightDifference: function() {
-        return rightDifference;
-    },
-    separate: function() {
-        return separate;
-    },
-    tail: function() {
-        return tail;
-    }
-});
-var _necessary = require("necessary");
-var first = _necessary.arrayUtilities.first, last = _necessary.arrayUtilities.last, front = _necessary.arrayUtilities.front, tail = _necessary.arrayUtilities.tail, push = _necessary.arrayUtilities.push, find = _necessary.arrayUtilities.find, match = _necessary.arrayUtilities.match, clear = _necessary.arrayUtilities.clear, prune = _necessary.arrayUtilities.prune, reverse = _necessary.arrayUtilities.reverse, extract = _necessary.arrayUtilities.extract, correlate = _necessary.arrayUtilities.correlate, filter = _necessary.arrayUtilities.filter, compress = _necessary.arrayUtilities.compress, separate = _necessary.arrayUtilities.separate;
-function leftDifference(arrayA, arrayB) {
-    filter(arrayA, function(elementA) {
-        var arrayBIncludesElementA = arrayB.includes(elementA);
-        if (!arrayBIncludesElementA) {
-            return true;
-        }
-    });
-}
-function rightDifference(arrayA, arrayB) {
-    filter(arrayB, function(elementB) {
-        var arrayAIncludesElementB = arrayA.includes(elementB);
-        if (!arrayAIncludesElementB) {
-            return true;
-        }
-    });
-}
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvYXJyYXkuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IGFycmF5VXRpbGl0aWVzIH0gZnJvbSBcIm5lY2Vzc2FyeVwiO1xuXG5leHBvcnQgY29uc3QgeyBmaXJzdCwgbGFzdCwgZnJvbnQsIHRhaWwsIHB1c2gsIGZpbmQsIG1hdGNoLCBjbGVhciwgcHJ1bmUsIHJldmVyc2UsIGV4dHJhY3QsIGNvcnJlbGF0ZSwgZmlsdGVyLCBjb21wcmVzcywgc2VwYXJhdGUgfSA9IGFycmF5VXRpbGl0aWVzO1xuXG5leHBvcnQgZnVuY3Rpb24gbGVmdERpZmZlcmVuY2UoYXJyYXlBLCBhcnJheUIpIHtcbiAgZmlsdGVyKGFycmF5QSwgKGVsZW1lbnRBKSA9PiB7XG4gICAgY29uc3QgYXJyYXlCSW5jbHVkZXNFbGVtZW50QSA9IGFycmF5Qi5pbmNsdWRlcyhlbGVtZW50QSk7XG5cbiAgICBpZiAoIWFycmF5QkluY2x1ZGVzRWxlbWVudEEpIHtcbiAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cbiAgfSk7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiByaWdodERpZmZlcmVuY2UoYXJyYXlBLCBhcnJheUIpIHtcbiAgZmlsdGVyKGFycmF5QiwgKGVsZW1lbnRCKSA9PiB7XG4gICAgY29uc3QgYXJyYXlBSW5jbHVkZXNFbGVtZW50QiA9IGFycmF5QS5pbmNsdWRlcyhlbGVtZW50Qik7XG5cbiAgICBpZiAoIWFycmF5QUluY2x1ZGVzRWxlbWVudEIpIHtcbiAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cbiAgfSk7XG59XG4iXSwibmFtZXMiOlsiY2xlYXIiLCJjb21wcmVzcyIsImNvcnJlbGF0ZSIsImV4dHJhY3QiLCJmaWx0ZXIiLCJmaW5kIiwiZmlyc3QiLCJmcm9udCIsImxhc3QiLCJsZWZ0RGlmZmVyZW5jZSIsIm1hdGNoIiwicHJ1bmUiLCJwdXNoIiwicmV2ZXJzZSIsInJpZ2h0RGlmZmVyZW5jZSIsInNlcGFyYXRlIiwidGFpbCIsImFycmF5VXRpbGl0aWVzIiwiYXJyYXlBIiwiYXJyYXlCIiwiZWxlbWVudEEiLCJhcnJheUJJbmNsdWRlc0VsZW1lbnRBIiwiaW5jbHVkZXMiLCJlbGVtZW50QiIsImFycmF5QUluY2x1ZGVzRWxlbWVudEIiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztJQUk0REEsS0FBSztlQUFMQTs7SUFBbURDLFFBQVE7ZUFBUkE7O0lBQW5CQyxTQUFTO2VBQVRBOztJQUFUQyxPQUFPO2VBQVBBOztJQUFvQkMsTUFBTTtlQUFOQTs7SUFBeERDLElBQUk7ZUFBSkE7O0lBQWhDQyxLQUFLO2VBQUxBOztJQUFhQyxLQUFLO2VBQUxBOztJQUFOQyxJQUFJO2VBQUpBOztJQUVOQyxjQUFjO2VBQWRBOztJQUZxQ0MsS0FBSztlQUFMQTs7SUFBY0MsS0FBSztlQUFMQTs7SUFBMUJDLElBQUk7ZUFBSkE7O0lBQWlDQyxPQUFPO2VBQVBBOztJQVkxREMsZUFBZTtlQUFmQTs7SUFaeUdDLFFBQVE7ZUFBUkE7O0lBQXRGQyxJQUFJO2VBQUpBOzs7eUJBRko7QUFFeEIsSUFBUVYsUUFBdUhXLHlCQUFjLENBQXJJWCxPQUFPRSxPQUFnSFMseUJBQWMsQ0FBOUhULE1BQU1ELFFBQTBHVSx5QkFBYyxDQUF4SFYsT0FBT1MsT0FBbUdDLHlCQUFjLENBQWpIRCxNQUFNSixPQUE2RksseUJBQWMsQ0FBM0dMLE1BQU1QLE9BQXVGWSx5QkFBYyxDQUFyR1osTUFBTUssUUFBaUZPLHlCQUFjLENBQS9GUCxPQUFPVixRQUEwRWlCLHlCQUFjLENBQXhGakIsT0FBT1csUUFBbUVNLHlCQUFjLENBQWpGTixPQUFPRSxVQUE0REkseUJBQWMsQ0FBMUVKLFNBQVNWLFVBQW1EYyx5QkFBYyxDQUFqRWQsU0FBU0QsWUFBMENlLHlCQUFjLENBQXhEZixXQUFXRSxTQUErQmEseUJBQWMsQ0FBN0NiLFFBQVFILFdBQXVCZ0IseUJBQWMsQ0FBckNoQixVQUFVYyxXQUFhRSx5QkFBYyxDQUEzQkY7QUFFbEgsU0FBU04sZUFBZVMsTUFBTSxFQUFFQyxNQUFNO0lBQzNDZixPQUFPYyxRQUFRLFNBQUNFO1FBQ2QsSUFBTUMseUJBQXlCRixPQUFPRyxRQUFRLENBQUNGO1FBRS9DLElBQUksQ0FBQ0Msd0JBQXdCO1lBQzNCLE9BQU87UUFDVDtJQUNGO0FBQ0Y7QUFFTyxTQUFTUCxnQkFBZ0JJLE1BQU0sRUFBRUMsTUFBTTtJQUM1Q2YsT0FBT2UsUUFBUSxTQUFDSTtRQUNkLElBQU1DLHlCQUF5Qk4sT0FBT0ksUUFBUSxDQUFDQztRQUUvQyxJQUFJLENBQUNDLHdCQUF3QjtZQUMzQixPQUFPO1FBQ1Q7SUFDRjtBQUNGIn0=

package/src/utilities/array.js

@@ -1,25 +0,0 @@
-"use strict";
-
-import { arrayUtilities } from "necessary";
-
-export const { first, last, front, tail, push, find, match, clear, prune, reverse, extract, correlate, filter, compress, separate } = arrayUtilities;
-
-export function leftDifference(arrayA, arrayB) {
-  filter(arrayA, (elementA) => {
-    const arrayBIncludesElementA = arrayB.includes(elementA);
-
-    if (!arrayBIncludesElementA) {
-      return true;
-    }
-  });
-}
-
-export function rightDifference(arrayA, arrayB) {
-  filter(arrayB, (elementB) => {
-    const arrayAIncludesElementB = arrayA.includes(elementB);
-
-    if (!arrayAIncludesElementB) {
-      return true;
-    }
-  });
-}