occam-verify-cli 1.0.473 → 1.0.475

package/src/element/substitution/term.js

@@ -1,14 +1,17 @@
 "use strict";
 
+import { elements } from "occam-furtle";
+
 import Substitution from "../substitution";
 
-import { define } from "../../elements";
 import { literally } from "../../utilities/context";
 import { stripBracketsFromTerm } from "../../utilities/brackets";
 import { instantiateTermSubstitution } from "../../process/instantiate";
 import { termSubstitutionStringFromTermAndVariable } from "../../utilities/string";
 import { termSubstitutionFromStatementNode, termSubstitutionFromTermSubstitutionNode } from "../../utilities/element";
 
+const { define } = elements;
+
 export default define(class TermSubstitution extends Substitution {
   constructor(context, string, node, targetTerm, replacementTerm) {
     super(context, string, node);

package/src/element/substitution.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import Element from "../element";
+import { Element } from "occam-furtle";
 
 export default class Substitution extends Element {
   constructor(context, string, node) {

package/src/element/substitutions.js

@@ -1,14 +1,13 @@
 "use strict";
 
 import { arrayUtilities } from "necessary";
+import { Element, elements } from "occam-furtle";
 
-import Element from "../element";
-
-import { define } from "../elements";
 import { EMPTY_STRING } from "../constants";
 import { substitutionsStringFromSubstitutions } from "../utilities/string";
 
-const { find, first, clear, prune, filter, extract, compress, correlate } = arrayUtilities;
+const { define } = elements,
+      { find, first, clear, prune, filter, extract, compress, correlate } = arrayUtilities;
 
 export default define(class Substitutions extends Element {
   constructor(context, string, node, array, savedArray) {

package/src/element/term.js

@@ -1,14 +1,13 @@
 "use strict";
 
 import { arrayUtilities } from "necessary";
+import { Element, elements } from "occam-furtle";
 
-import Element from "../element";
-
-import { define } from "../elements";
 import { validateTerms } from "../utilities/validation";
 import { typeToTypeJSON } from "../utilities/json";
 
-const { filter, compress } = arrayUtilities;
+const { define } = elements,
+      { filter, compress } = arrayUtilities;
 
 export default define(class Term extends Element {
   constructor(context, string, node, type) {

package/src/element/topLevelAssertion/axiom.js

@@ -1,8 +1,10 @@
 "use strict";
 
+import { elements } from "occam-furtle";
+
 import TopLevelAssertion  from "../../node/topLevelAssertion";
 
-import { define } from "../../elements";
+const { define } = elements;
 
 export default define(class Axiom extends TopLevelAssertion {
   isSatisfiable() {

package/src/element/topLevelAssertion/conjecture.js

@@ -1,8 +1,10 @@
 "use strict";
 
+import { elements } from "occam-furtle";
+
 import TopLevelAssertion from "../topLevelAssertion";
 
-import { define } from "../../elements";
+const { define } = elements;
 
 export default define(class Conjecture extends TopLevelAssertion {
   verify() {

package/src/element/topLevelAssertion/lemma.js

@@ -1,8 +1,10 @@
 "use strict";
 
+import { elements } from "occam-furtle";
+
 import TopLevelAssertion from "../topLevelAssertion";
 
-import { define } from "../../elements";
+const { define } = elements;
 
 export default define(class Lemma extends TopLevelAssertion {
   verify() {

package/src/element/topLevelAssertion/theorem.js

@@ -1,8 +1,10 @@
 "use strict";
 
+import { elements } from "occam-furtle";
+
 import TopLevelAssertion from "../topLevelAssertion";
 
-import { define } from "../../elements";
+const { define } = elements;
 
 export default define(class Theorem extends TopLevelAssertion {
   verify() {

package/src/element/topLevelAssertion.js

@@ -1,9 +1,8 @@
 "use strict";
 
+import { Element } from "occam-furtle";
 import { arrayUtilities } from "necessary";
 
-import Element from "../element";
-
 import { scope, attempt } from "../utilities/context";
 import { labelsFromJSON,
          deductionFromJSON,

package/src/element/topLevelMetaAssertion/metaLemma.js

@@ -1,8 +1,10 @@
 "use strict";
 
+import { elements } from "occam-furtle";
+
 import TopLevelMetaAssertion from "./../topLevelMetaAssertion";
 
-import { define } from "../../elements";
+const { define } = elements;
 
 export default define(class MetaLemma extends TopLevelMetaAssertion {
   verify() {

package/src/element/topLevelMetaAssertion/metatheorem.js

@@ -1,8 +1,10 @@
 "use strict";
 
+import { elements } from "occam-furtle";
+
 import TopLevelMetaAssertion from "../topLevelMetaAssertion";
 
-import { define } from "../../elements";
+const { define } = elements;
 
 export default define(class Metatheorem extends TopLevelMetaAssertion {
   verify() {

package/src/element/topLevelMetaAssertion.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import Element from "../element";
+import { Element } from "occam-furtle";
 
 import { scope } from "../utilities/context";
 import { labelFromJSON,

package/src/element/type.js

@@ -1,15 +1,14 @@
 "use strict";
 
 import { arrayUtilities } from "necessary";
+import { Element, elements } from "occam-furtle";
 
-import Element from "../element";
-
-import { define } from "../elements";
 import { baseTypeFromNothing } from "../types";
 import { typeStringFromTypeNameTypePrefixNameAndSuperTypes } from "../utilities/string";
 import { superTypesFromJSON, propertiesFromJSON, superTypesToSuperTypesJSON, propertiesToPropertiesJSON } from "../utilities/json";
 
-const { push, first } = arrayUtilities;
+const { define } = elements,
+      { push, first } = arrayUtilities;
 
 export default define(class Type extends Element {
   constructor(context, string, node, name, prefixName, superTypes, properties, provisional) {

package/src/element/typePrefix.js

@@ -1,8 +1,8 @@
 "use strict";
 
-import Element from "../element";
+import { Element, elements } from "occam-furtle";
 
-import { define } from "../elements";
+const { define } = elements;
 
 export default define(class TypePrefix extends Element {
   constructor(context, string, node, name) {

package/src/element/variable.js

@@ -1,12 +1,12 @@
 "use strict";
 
-import Element from "../element";
-import elements from "../elements";
+import { Element, elements } from "occam-furtle";
 
-import { define } from "../elements";
 import { synthetically } from "../utilities/context";
 import { typeToTypeJSON } from "../utilities/json";
 
+const { define } = elements;
+
 export default define(class Variable extends Element {
   constructor(context, string, node, type, identifier, propertyRelations) {
     super(context, string, node);

package/src/metaTypes.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import elements from "./elements";
+import { elements } from "occam-furtle";
 
 import { FRAME_META_TYPE_NAME, REFERENCE_META_TYPE_NAME, STATEMENT_META_TYPE_NAME } from "./metaTypeNames";
 

package/src/types.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import elements from "./elements";
+import { elements } from "occam-furtle";
 
 import { BASE_TYPE_SYMBOL } from "./constants";
 

package/src/utilities/element.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import elements from "../elements";
+import { elements } from "occam-furtle";
 
 import { literally } from "../utilities/context";
 import { baseTypeFromNothing } from "../types";

package/src/utilities/json.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import elements from "../elements";
+import { elements } from "occam-furtle";
 
 import { findMetaTypeByMetaTypeName } from "../metaTypes";
 

package/src/utilities/unification.js

@@ -1,9 +1,8 @@
 "use strict";
 
+import { elements } from "occam-furtle";
 import { arrayUtilities } from "necessary";
 
-import elements from "../elements";
-
 import { synthetically } from "../utilities/context";
 import { equalityFromStatement,
          judgementFromStatement,

package/src/utilities/validation.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import elements from "../elements";
+import { elements } from "occam-furtle";
 
 import { bracketedConstructorFromNothing, bracketedCombinatorFromNothing } from "../utilities/instance";
 import { equalityFromStatement,

package/lib/element.js

@@ -1,91 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return Element;
-    }
-});
-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;
-}
-var Element = /*#__PURE__*/ function() {
-    function Element(context, string, node) {
-        _class_call_check(this, Element);
-        this.context = context;
-        this.string = string;
-        this.node = node;
-    }
-    _create_class(Element, [
-        {
-            key: "getContext",
-            value: function getContext() {
-                return this.context;
-            }
-        },
-        {
-            key: "getString",
-            value: function getString() {
-                return this.string;
-            }
-        },
-        {
-            key: "getNode",
-            value: function getNode() {
-                return this.node;
-            }
-        },
-        {
-            key: "setContext",
-            value: function setContext(context) {
-                this.context = context;
-            }
-        },
-        {
-            key: "setString",
-            value: function setString(string) {
-                this.string = string;
-            }
-        },
-        {
-            key: "setNode",
-            value: function setNode(node) {
-                this.node = node;
-            }
-        },
-        {
-            key: "matchNode",
-            value: function matchNode(node) {
-                return this.node.match(node);
-            }
-        },
-        {
-            key: "isEqualTo",
-            value: function isEqualTo(element) {
-                var elementNode = element.getNode(), matches = this.node.match(elementNode), equalTo = matches; ///
-                return equalTo;
-            }
-        }
-    ]);
-    return Element;
-}();
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9lbGVtZW50LmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBFbGVtZW50IHtcbiAgY29uc3RydWN0b3IoY29udGV4dCwgc3RyaW5nLCBub2RlKSB7XG4gICAgdGhpcy5jb250ZXh0ID0gY29udGV4dDtcbiAgICB0aGlzLnN0cmluZyA9IHN0cmluZztcbiAgICB0aGlzLm5vZGUgPSBub2RlO1xuICB9XG5cbiAgZ2V0Q29udGV4dCgpIHtcbiAgICByZXR1cm4gdGhpcy5jb250ZXh0O1xuICB9XG5cbiAgZ2V0U3RyaW5nKCkge1xuICAgIHJldHVybiB0aGlzLnN0cmluZztcbiAgfVxuXG4gIGdldE5vZGUoKSB7XG4gICAgcmV0dXJuIHRoaXMubm9kZTtcbiAgfVxuXG4gIHNldENvbnRleHQoY29udGV4dCkge1xuICAgIHRoaXMuY29udGV4dCA9IGNvbnRleHQ7XG4gIH1cblxuICBzZXRTdHJpbmcoc3RyaW5nKSB7XG4gICAgdGhpcy5zdHJpbmcgPSBzdHJpbmc7XG4gIH1cblxuICBzZXROb2RlKG5vZGUpIHtcbiAgICB0aGlzLm5vZGUgPSBub2RlO1xuICB9XG5cbiAgbWF0Y2hOb2RlKG5vZGUpIHsgcmV0dXJuIHRoaXMubm9kZS5tYXRjaChub2RlKTsgfVxuXG4gIGlzRXF1YWxUbyhlbGVtZW50KSB7XG4gICAgY29uc3QgZWxlbWVudE5vZGUgPSBlbGVtZW50LmdldE5vZGUoKSxcbiAgICAgICAgICBtYXRjaGVzID0gdGhpcy5ub2RlLm1hdGNoKGVsZW1lbnROb2RlKSxcbiAgICAgICAgICBlcXVhbFRvID0gbWF0Y2hlczsgIC8vL1xuXG4gICAgcmV0dXJuIGVxdWFsVG87XG4gIH1cbn1cbiJdLCJuYW1lcyI6WyJFbGVtZW50IiwiY29udGV4dCIsInN0cmluZyIsIm5vZGUiLCJnZXRDb250ZXh0IiwiZ2V0U3RyaW5nIiwiZ2V0Tm9kZSIsInNldENvbnRleHQiLCJzZXRTdHJpbmciLCJzZXROb2RlIiwibWF0Y2hOb2RlIiwibWF0Y2giLCJpc0VxdWFsVG8iLCJlbGVtZW50IiwiZWxlbWVudE5vZGUiLCJtYXRjaGVzIiwiZXF1YWxUbyJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7ZUFFcUJBOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQU4sSUFBQSxBQUFNQSx3QkFBTjthQUFNQSxRQUNQQyxPQUFPLEVBQUVDLE1BQU0sRUFBRUMsSUFBSTtnQ0FEZEg7UUFFakIsSUFBSSxDQUFDQyxPQUFPLEdBQUdBO1FBQ2YsSUFBSSxDQUFDQyxNQUFNLEdBQUdBO1FBQ2QsSUFBSSxDQUFDQyxJQUFJLEdBQUdBOztrQkFKS0g7O1lBT25CSSxLQUFBQTttQkFBQUEsU0FBQUE7Z0JBQ0UsT0FBTyxJQUFJLENBQUNILE9BQU87WUFDckI7OztZQUVBSSxLQUFBQTttQkFBQUEsU0FBQUE7Z0JBQ0UsT0FBTyxJQUFJLENBQUNILE1BQU07WUFDcEI7OztZQUVBSSxLQUFBQTttQkFBQUEsU0FBQUE7Z0JBQ0UsT0FBTyxJQUFJLENBQUNILElBQUk7WUFDbEI7OztZQUVBSSxLQUFBQTttQkFBQUEsU0FBQUEsV0FBV04sT0FBTztnQkFDaEIsSUFBSSxDQUFDQSxPQUFPLEdBQUdBO1lBQ2pCOzs7WUFFQU8sS0FBQUE7bUJBQUFBLFNBQUFBLFVBQVVOLE1BQU07Z0JBQ2QsSUFBSSxDQUFDQSxNQUFNLEdBQUdBO1lBQ2hCOzs7WUFFQU8sS0FBQUE7bUJBQUFBLFNBQUFBLFFBQVFOLElBQUk7Z0JBQ1YsSUFBSSxDQUFDQSxJQUFJLEdBQUdBO1lBQ2Q7OztZQUVBTyxLQUFBQTttQkFBQUEsU0FBQUEsVUFBVVAsSUFBSTtnQkFBSSxPQUFPLElBQUksQ0FBQ0EsSUFBSSxDQUFDUSxLQUFLLENBQUNSO1lBQU87OztZQUVoRFMsS0FBQUE7bUJBQUFBLFNBQUFBLFVBQVVDLE9BQU87Z0JBQ2YsSUFBTUMsY0FBY0QsUUFBUVAsT0FBTyxJQUM3QlMsVUFBVSxJQUFJLENBQUNaLElBQUksQ0FBQ1EsS0FBSyxDQUFDRyxjQUMxQkUsVUFBVUQsU0FBVSxHQUFHO2dCQUU3QixPQUFPQztZQUNUOzs7V0F2Q21CaEIifQ==

package/lib/elements.js

@@ -1,27 +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: Object.getOwnPropertyDescriptor(all, name).get
-    });
-}
-_export(exports, {
-    get default () {
-        return _default;
-    },
-    get define () {
-        return define;
-    }
-});
-var elements = {};
-function define(Element) {
-    var name = Element.name;
-    elements[name] = Element;
-    return Element;
-}
-var _default = elements;
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9lbGVtZW50cy5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuY29uc3QgZWxlbWVudHMgPSB7fTtcblxuZXhwb3J0IGZ1bmN0aW9uIGRlZmluZShFbGVtZW50KSB7XG4gIGNvbnN0IHsgbmFtZSB9ID0gRWxlbWVudDtcblxuICBlbGVtZW50c1tuYW1lXSA9IEVsZW1lbnQ7XG5cbiAgcmV0dXJuIEVsZW1lbnQ7XG59XG5cbmV4cG9ydCBkZWZhdWx0IGVsZW1lbnRzO1xuIl0sIm5hbWVzIjpbImRlZmluZSIsImVsZW1lbnRzIiwiRWxlbWVudCIsIm5hbWUiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztRQVlBO2VBQUE7O1FBUmdCQTtlQUFBQTs7O0FBRmhCLElBQU1DLFdBQVcsQ0FBQztBQUVYLFNBQVNELE9BQU9FLE9BQU87SUFDNUIsSUFBTSxBQUFFQyxPQUFTRCxRQUFUQztJQUVSRixRQUFRLENBQUNFLEtBQUssR0FBR0Q7SUFFakIsT0FBT0E7QUFDVDtJQUVBLFdBQWVEIn0=

package/src/element.js

@@ -1,43 +0,0 @@
-"use strict";
-
-export default class Element {
-  constructor(context, string, node) {
-    this.context = context;
-    this.string = string;
-    this.node = node;
-  }
-
-  getContext() {
-    return this.context;
-  }
-
-  getString() {
-    return this.string;
-  }
-
-  getNode() {
-    return this.node;
-  }
-
-  setContext(context) {
-    this.context = context;
-  }
-
-  setString(string) {
-    this.string = string;
-  }
-
-  setNode(node) {
-    this.node = node;
-  }
-
-  matchNode(node) { return this.node.match(node); }
-
-  isEqualTo(element) {
-    const elementNode = element.getNode(),
-          matches = this.node.match(elementNode),
-          equalTo = matches;  ///
-
-    return equalTo;
-  }
-}

package/src/elements.js

@@ -1,13 +0,0 @@
-"use strict";
-
-const elements = {};
-
-export function define(Element) {
-  const { name } = Element;
-
-  elements[name] = Element;
-
-  return Element;
-}
-
-export default elements;