occam-verify-cli 1.0.475 → 1.0.478

package/src/element/declaration/metavariable.js

@@ -1,10 +1,8 @@
 "use strict";
 
-import { elements } from "occam-furtle";
-
 import Declaration from "../declaration";
 
-const { define } = elements;
+import { define } from "../../elements";
 
 export default define(class MetavariableDeclaration extends Declaration {
   constructor(context, string, node, metavariable) {

package/src/element/declaration/simpleType.js

@@ -1,10 +1,8 @@
 "use strict";
 
-import { elements } from "occam-furtle";
-
 import Declaration from "../declaration";
 
-const { define } = elements;
+import { define } from "../../elements";
 
 export default define(class SimpleTypeDeclaration extends Declaration {
   constructor(context, string, node, type, prefixed) {

package/src/element/declaration/typePrefix.js

@@ -1,10 +1,8 @@
 "use strict";
 
-import { elements } from "occam-furtle";
-
 import Declaration from "../declaration";
 
-const { define } = elements;
+import { define } from "../../elements";
 
 export default define(class TypePrefixDeclaration extends Declaration {
   constructor(context, string, node, typePrefix) {

package/src/element/declaration/variable.js

@@ -1,10 +1,8 @@
 "use strict";
 
-import { elements } from "occam-furtle";
-
 import Declaration from "../declaration";
 
-const { define } = elements;
+import { define } from "../../elements";
 
 export default define(class VariableDeclaration extends Declaration {
   constructor(context, string, node, variable) {

package/src/element/deduction.js

@@ -1,12 +1,11 @@
 "use strict";
 
-import { Element, elements } from "occam-furtle";
+import { Element } from "occam-furtle";
 
+import { define } from "../elements";
 import { attempt } from "../utilities/context";
 import { termsFromJSON, framesFromJSON, statementFromJSON, termsToTermsJSON, framesToFramesJSON, statementToStatementJSON } from "../utilities/json";
 
-const { define } = elements;
-
 export default define(class Deduction extends Element {
   constructor(context, string, node, statement) {
     super(context, string, node);

package/src/element/derivation.js

@@ -1,12 +1,13 @@
 "use strict";
 
+import { Element } from "occam-furtle";
 import { arrayUtilities } from "necessary";
-import { Element, elements } from "occam-furtle";
 
 import assignAssignments from "../process/assign";
 
-const { last } = arrayUtilities,
-      { define } = elements;
+import { define } from "../elements";
+
+const { last } = arrayUtilities;
 
 export default define(class Derivation extends Element {
   constructor(context, string, node, subproofOrProofAssertions) {

package/src/element/equality.js

@@ -1,12 +1,11 @@
 "use strict";
 
-import { Element, elements } from "occam-furtle";
+import { Element } from "occam-furtle";
 
+import { define } from "../elements";
 import { equateTerms } from "../process/equate";
 import { equalityAssignmentFromEquality, variableAssignmentFromVariable } from "../process/assign";
 
-const { define } = elements;
-
 export default define(class Equality extends Element {
   constructor(context, string, node, leftTerm, rightTerm) {
     super(context, string, node);

package/src/element/equivalence.js

@@ -1,16 +1,16 @@
 "use strict";
 
+import { Element } from "occam-furtle";
 import { arrayUtilities } from "necessary";
-import { Element, elements } from "occam-furtle";
 
+import { define } from "../elements";
 import { literally } from "../utilities/context";
 import { termsStringFromTerms } from "../utilities/string";
 import { instantiateEquivalence } from "../process/instantiate";
 import { stripBracketsFromTermNode } from "../utilities/brackets";
 import { equivalenceFromEquivalenceNode } from "../utilities/element";
 
-const { define } = elements,
-      { compress } = arrayUtilities;
+const { compress } = arrayUtilities;
 
 export default define(class Equivalence extends Element {
   constructor(context, string, node, terms) {

package/src/element/equivalences.js

@@ -1,13 +1,13 @@
 "use strict";
 
+import { Element } from "occam-furtle";
 import { arrayUtilities } from "necessary";
-import { Element, elements } from "occam-furtle";
 
+import { define } from "../elements";
 import { EMPTY_STRING } from "../constants";
 import { variablesFromTerm } from "./term";
 
-const { define } = elements,
-      { push, separate } = arrayUtilities;
+const { push, separate } = arrayUtilities;
 
 export default define(class Equivalences extends Element {
   constructor(context, string, node, array) {

package/src/element/error.js

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

package/src/element/frame.js

@@ -1,13 +1,13 @@
 "use strict";
 
+import { Element } from "occam-furtle";
 import { arrayUtilities } from "necessary";
-import { Element, elements } from "occam-furtle";
 
+import { define } from "../elements";
 import { FRAME_META_TYPE_NAME } from "../metaTypeNames";
 import { assumptionsStringFromAssumptions } from "../utilities/string";
 
-const { first } = arrayUtilities,
-      { define } = elements;
+const { first } = arrayUtilities;
 
 export default define(class Frame extends Element {
   constructor(context, string, node, assumptions) {

package/src/element/hypothesis.js

@@ -1,13 +1,12 @@
 "use strict";
 
-import { Element, elements } from "occam-furtle";
+import { Element } from "occam-furtle";
 
 import assignAssignments from "../process/assign";
 
+import { define } from "../elements";
 import { statementFromJSON, statementToStatementJSON } from "../utilities/json";
 
-const { define } = elements;
-
 export default define(class Hypothesis extends Element {
   constructor(context, string, node, statement) {
     super(context, string, node);

package/src/element/judgement.js

@@ -1,11 +1,10 @@
 "use strict";
 
-import { Element, elements } from "occam-furtle";
+import { Element } from "occam-furtle";
 
+import { define } from "../elements";
 import { judgementAssignmentFromJudgement } from "../process/assign";
 
-const { define } = elements;
-
 export default define(class Judgement extends Element {
   constructor(context, string, node, frame, assumption) {
     super(context, string, node);

package/src/element/label.js

@@ -1,11 +1,10 @@
 "use strict";
 
-import { Element, elements } from "occam-furtle";
+import { Element } from "occam-furtle";
 
+import { define } from "../elements";
 import { metavariableFromJSON, metavariableToMetavariableJSON } from "../utilities/json";
 
-const { define } = elements;
-
 export default define(class Label extends Element {
   constructor(context, string, node, metavariable) {
     super(context, string, node);

package/src/element/metaType.js

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

package/src/element/metavariable.js

@@ -1,15 +1,16 @@
 "use strict";
 
-import { Element, elements } from "occam-furtle";
+import { Element } from "occam-furtle";
 
+import elements from "../elements";
+
+import { define } from "../elements";
 import { EMPTY_STRING } from "../constants";
 import { synthetically } from "../utilities/context";
 import { typeToTypeJSON } from "../utilities/json";
 import { metaTypeToMetaTypeJSON } from "../utilities/json";
 import { unifyMetavariable, unifyMetavariableIntrinsically } from "../process/unify";
 
-const { define } = elements;
-
 export default define(class Metavariable extends Element {
   constructor(context, string, node, name, type, metaType) {
     super(context, string, node);

package/src/element/parameter.js

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

package/src/element/procedureCall.js

@@ -1,12 +1,11 @@
 "use strict";
 
+import { Element } from "occam-furtle";
 import { Expressions } from "occam-furtle";
-import { Element, elements } from "occam-furtle";
 
+import { define } from "../elements";
 import { parametersFromJSON, procedureReferenceFromJSON, parametersToParametersJSON, procedureReferenceToProcedureReferenceJSON } from "../utilities/json";
 
-const { define } = elements;
-
 export default define(class ProcedureCall extends Element {
   constructor(context, string, node, parameters, procedureReference) {
     super(context, string, node);

package/src/element/procedureReference.js

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

package/src/element/proof.js

@@ -1,10 +1,9 @@
 "use strict";
 
-import { Element, elements } from "occam-furtle";
+import { Element } from "occam-furtle";
 
 import { scope } from "../utilities/context";
-
-const { define } = elements;
+import { define } from "../elements";
 
 export default define(class Proof extends Element {
   constructor(context, string, node, derivation) {

package/src/element/proofAssertion/premise.js

@@ -1,10 +1,9 @@
 "use strict";
 
-import { elements } from "occam-furtle";
-
 import ProofAssertion from "../proofAssertion";
 import assignAssignments from "../../process/assign";
 
+import { define } from "../../elements";
 import { attempt, synthetically } from "../../utilities/context";
 import { termsFromJSON,
          framesFromJSON,
@@ -15,8 +14,6 @@ import { termsFromJSON,
          statementToStatementJSON,
          procedureCallToProcedureCallJSON } from "../../utilities/json";
 
-const { define } = elements;
-
 export default define(class Premise extends ProofAssertion {
   constructor(context, string, node, statement, procedureCall) {
     super(context, string, node, statement);

package/src/element/proofAssertion/step.js

@@ -1,15 +1,13 @@
 "use strict";
 
-import { elements } from "occam-furtle";
-
+import elements from "../../elements";
 import ProofAssertion from "../proofAssertion";
 
+import { define } from "../../elements";
 import { unifyStatements } from "../../utilities/unification";
 import { attempt, liminally } from "../../utilities/context";
 import { propertyAssertionFromStatement } from "../../utilities/statement";
 
-const { define } = elements;
-
 export default define(class Step extends ProofAssertion {
   constructor(context, string, node, statement, reference, satisfiesAssertion) {
     super(context, string, node, statement);

package/src/element/proofAssertion/supposition.js

@@ -1,10 +1,9 @@
 "use strict";
 
-import { elements } from "occam-furtle";
-
 import ProofAssertion from "../proofAssertion";
 import assignAssignments from "../../process/assign";
 
+import { define } from "../../elements";
 import { attempt, synthetically } from "../../utilities/context";
 import { termsFromJSON,
          framesFromJSON,
@@ -15,8 +14,6 @@ import { termsFromJSON,
          statementToStatementJSON,
          procedureCallToProcedureCallJSON } from "../../utilities/json";
 
-const { define } = elements;
-
 export default define(class Supposition extends ProofAssertion {
   constructor(context, string, node, statement, procedureCall) {
     super(context, string, node, statement);

package/src/element/property.js

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

package/src/element/propertyRelation.js

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

package/src/element/reference.js

@@ -1,15 +1,14 @@
 "use strict";
 
-import { Element, elements } from "occam-furtle";
+import { Element } from "occam-furtle";
 
+import { define } from "../elements";
 import { attempt } from "../utilities/context";
 import { REFERENCE_META_TYPE_NAME } from "../metaTypeNames";
 import { findMetaTypeByMetaTypeName } from "../metaTypes";
 import { unifyMetavariableIntrinsically } from "../process/unify";
 import { metavariableFromJSON, metavariableToMetavariableJSON } from "../utilities/json";
 
-const { define } = elements;
-
 export default define(class Reference extends Element {
   constructor(context, string, node, metavariable) {
     super(context, string, node);

package/src/element/rule.js

@@ -1,9 +1,12 @@
 "use strict";
 
+import { Element } from "occam-furtle";
 import { arrayUtilities } from "necessary";
-import { Element, elements } from "occam-furtle";
+
+import elements from "../elements";
 
 import { scope } from "../utilities/context";
+import { define } from "../elements";
 import { labelsFromJSON,
          premisesFromJSON,
          conclusionFromJSON,
@@ -11,8 +14,7 @@ import { labelsFromJSON,
          premisesToPremisesJSON,
          conclusionToConclusionJSON } from "../utilities/json";
 
-const { define } = elements,
-      { reverse, extract, backwardsEvery } = arrayUtilities;
+const { reverse, extract, backwardsEvery } = arrayUtilities;
 
 export default define(class Rule extends Element {
   constructor(context, string, node, proof, labels, premises, conclusion) {

package/src/element/section.js

@@ -1,8 +1,8 @@
 "use strict";
 
-import { Element, elements } from "occam-furtle";
+import { Element } from "occam-furtle";
 
-const { define } = elements;
+import { define } from "../elements";
 
 export default define(class Section extends Element {
   constructor(context, string, node, hypotheses, axiom, lemma, theorem, conjecture) {

package/src/element/signature.js

@@ -1,14 +1,14 @@
 "use strict";
 
+import { Element } from "occam-furtle";
 import { arrayUtilities } from "necessary";
-import { Element, elements } from "occam-furtle";
 
+import { define } from "../elements";
 import { synthetically } from "../utilities/context";
 import { signatureStringFromTerms } from "../utilities/string";
 import { termsFromJSON, termsToTermsJSON } from "../utilities/json";
 
-const { define } = elements,
-      { match, compare, correlate } = arrayUtilities;
+const { match, compare, correlate } = arrayUtilities;
 
 export default define(class Signature extends Element {
   constructor(context, string, node, terms) {

package/src/element/statement.js

@@ -1,14 +1,14 @@
 "use strict";
 
+import { Element } from "occam-furtle";
 import { arrayUtilities } from "necessary";
-import { Element, elements } from "occam-furtle";
 
+import { define } from "../elements";
 import { unifyStatement } from "../process/unify";
 import { validateStatements } from "../utilities/validation";
 import { STATEMENT_META_TYPE_NAME } from "../metaTypeNames";
 
-const { define } = elements,
-      { match, backwardsSome } = arrayUtilities;
+const { match, backwardsSome } = arrayUtilities;
 
 export default define(class Statement extends Element {
   constructor(context, string, node) {

package/src/element/subDerivation.js

@@ -1,12 +1,13 @@
 "use strict";
 
+import { Element } from "occam-furtle";
 import { arrayUtilities } from "necessary";
-import { Element, elements } from "occam-furtle";
 
 import assignAssignments from "../process/assign";
 
-const { last } = arrayUtilities,
-      { define } = elements;
+import { define } from "../elements";
+
+const { last } = arrayUtilities;
 
 export default define(class SubDerivation extends Element {
   constructor(context, string, node, subproofOrProofAssertions) {

package/src/element/subproof.js

@@ -1,10 +1,9 @@
 "use strict";
 
-import { Element, elements } from "occam-furtle";
+import { Element } from "occam-furtle";
 
 import { scope } from "../utilities/context";
-
-const { define } = elements;
+import { define } from "../elements";
 
 export default define(class Subproof extends Element {
   constructor(context, string, node, suppositions, subDerivation) {

package/src/element/substitution/frame.js

@@ -1,16 +1,13 @@
 "use strict";
 
-import { elements } from "occam-furtle";
-
 import Substitution from "../substitution";
 
+import { define } from "../../elements";
 import { literally } from "../../utilities/context";
 import { instantiateFrameSubstitution } from "../../process/instantiate";
 import { frameSubstitutionStringFromFrameAndMetavariable } from "../../utilities/string";
 import { frameSubstitutionFromStatementNode, frameSubstitutionFromFrameSubstitutionNode } from "../../utilities/element";
 
-const { define } = elements;
-
 export default define(class FrameSubstitution extends Substitution {
   constructor(context, string, node, targetFrame, replacementFrame) {
     super(context, string, node);

package/src/element/substitution/reference.js

@@ -1,16 +1,13 @@
 "use strict";
 
-import { elements } from "occam-furtle";
-
 import Substitution from "../substitution";
 
+import { define } from "../../elements";
 import { literally } from "../../utilities/context";
 import { instantiateReferenceSubstitution } from "../../process/instantiate";
 import { referenceSubstitutionFromReferenceSubstitutionNode } from "../../utilities/element";
 import { referenceSubstitutionStringFromReferenceAndMetavariable } from "../../utilities/string";
 
-const { define } = elements;
-
 export default define(class ReferenceSubstitution extends Substitution {
   constructor(context, string, node, targetReference, replacementReference) {
     super(context, string, node);

package/src/element/substitution/statement.js

@@ -1,9 +1,9 @@
 "use strict";
 
-import { elements } from "occam-furtle";
-
+import elements from "../../elements";
 import Substitution from "../substitution";
 
+import { define } from "../../elements";
 import { literally } from "../../utilities/context";
 import { unifySubstitution } from "../../process/unify";
 import { stripBracketsFromStatement } from "../../utilities/brackets";
@@ -12,8 +12,6 @@ import { statementSubstitutionFromStatementSubstitutionNode } from "../../utilit
 import { statementToStatementJSON, metavariableToMetavariableJSON } from "../../utilities/json";
 import { statementSubstitutionStringFromStatementAndMetavariable, statementSubstitutionStringFromStatementMetavariableAndSubstitution } from "../../utilities/string";
 
-const { define } = elements;
-
 export default define(class StatementSubstitution extends Substitution {
   constructor(context, string, node, resolved, substitution, targetStatement, replacementStatement) {
     super(context, string, node);

package/src/element/substitution/term.js

@@ -1,17 +1,14 @@
 "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/substitutions.js

@@ -1,13 +1,13 @@
 "use strict";
 
+import { Element } from "occam-furtle";
 import { arrayUtilities } from "necessary";
-import { Element, elements } from "occam-furtle";
 
+import { define } from "../elements";
 import { EMPTY_STRING } from "../constants";
 import { substitutionsStringFromSubstitutions } from "../utilities/string";
 
-const { define } = elements,
-      { find, first, clear, prune, filter, extract, compress, correlate } = arrayUtilities;
+const { 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,13 +1,13 @@
 "use strict";
 
+import { Element } from "occam-furtle";
 import { arrayUtilities } from "necessary";
-import { Element, elements } from "occam-furtle";
 
+import { define } from "../elements";
 import { validateTerms } from "../utilities/validation";
 import { typeToTypeJSON } from "../utilities/json";
 
-const { define } = elements,
-      { filter, compress } = arrayUtilities;
+const { filter, compress } = arrayUtilities;
 
 export default define(class Term extends Element {
   constructor(context, string, node, type) {

package/src/element/topLevelAssertion/axiom.js

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