occam-verify-cli 1.0.383 → 1.0.385

package/src/{dom → ontology}/premise.js

@@ -1,13 +1,13 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 import { assignAssignments } from "../utilities/assignments";
 import { subproofAssertionFromStatement } from "../utilities/context";
 import { statementFromJSON, procedureCallFromJSON, statementToStatementJSON, procedureCallToProcedureCallJSON } from "../utilities/json";
 
-export default domAssigned(class Premise {
+export default define(class Premise {
   constructor(node, string, statement, procedureCall) {
     this.node = node;
     this.string = string;
@@ -49,7 +49,7 @@ export default domAssigned(class Premise {
         const assignmentsAssigned = assignAssignments(assignments, context);
 
         if (assignmentsAssigned) {
-          const { Step } = dom,
+          const { Step } = ontology,
                 step = Step.fromStatement(this.statement, context),
                 stepOrSubproof = step;  ///
 
@@ -226,7 +226,7 @@ export default domAssigned(class Premise {
   }
 
   static fromPremiseNode(premiseNode, context) {
-    const { Statement, ProcedureCall } = dom,
+    const { Statement, ProcedureCall } = ontology,
           node = premiseNode, ///
           string = context.nodeAsString(node),
           statement = Statement.fromPremiseNode(premiseNode, context),

package/src/{dom → ontology}/procedureCall.js

@@ -2,12 +2,12 @@
 
 import { Expressions } from "occam-furtle";
 
-import dom from "../dom";
+import ontology from "../ontology";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 import { parametersFromJSON, procedureReferenceFromJSON, parametersToParametersJSON, procedureReferenceToProcedureReferenceJSON } from "../utilities/json";
 
-export default domAssigned(class ProcedureCall {
+export default define(class ProcedureCall {
   constructor(node, string, procedureReference, parameters) {
     this.node = node;
     this.string = string;
@@ -153,7 +153,7 @@ export default domAssigned(class ProcedureCall {
 });
 
 function procedureCallFromProcedureCallNode(procedureCallNode, context) {
-  const { ProcedureCall, ProcedureReference } = dom,
+  const { ProcedureCall, ProcedureReference } = ontology,
         node = procedureCallNode, ///
         procedureReference = ProcedureReference.fromProcedureCallNode(procedureCallNode, context),
         parameters = parametersFromProcedureCallNode(procedureCallNode, context),
@@ -164,7 +164,7 @@ function procedureCallFromProcedureCallNode(procedureCallNode, context) {
 }
 
 function parametersFromProcedureCallNode(procedureCallNode, context) {
-  const { Parameter } = dom,
+  const { Parameter } = ontology,
         parameterNodes = procedureCallNode.getParameterNodes(),
         parameters = parameterNodes.map((parameterNode) => {
           const parameter = Parameter.fromParameterNode(parameterNode, context);

package/src/{dom → ontology}/procedureReference.js

@@ -1,8 +1,8 @@
 "use strict";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 
-export default domAssigned(class ProcedureReference {
+export default define(class ProcedureReference {
   constructor(string, name) {
     this.string = string;
     this.name = name;

package/src/{dom → ontology}/proof.js

@@ -1,11 +1,11 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 import LocalContext from "../context/local";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 
-export default domAssigned(class Proof {
+export default define(class Proof {
   constructor(derivation) {
     this.derivation = derivation;
   }
@@ -56,7 +56,7 @@ export default domAssigned(class Proof {
     let proof = null;
 
     if (proofNode !== null) {
-      const { Derivation } = dom,
+      const { Derivation } = ontology,
             derivationNode = proofNode.getDerivationNode(),
             derivation = Derivation.fromDerivationNode(derivationNode, context);
 

package/src/{dom → ontology}/property.js

@@ -1,10 +1,10 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 
-export default domAssigned(class Property {
+export default define(class Property {
   constructor(string, name, nominalTypeName) {
     this.string = string;
     this.name = name;
@@ -75,7 +75,7 @@ export default domAssigned(class Property {
 });
 
 function propertyFromPropertyNode(propertyNode, context) {
-  const { Property } = dom,
+  const { Property } = ontology,
         propertyName = propertyNode.getPropertyName(),
         nominalTypeName = null,
         name = propertyName,  ///

package/src/{dom → ontology}/propertyRelation.js

@@ -1,10 +1,10 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 
-export default domAssigned(class PropertyRelation {
+export default define(class PropertyRelation {
   constructor(string, node, tokens, property, term) {
     this.string = string;
     this.node = node;
@@ -119,7 +119,7 @@ export default domAssigned(class PropertyRelation {
   static name = "PropertyRelation";
 
   static fromPropertyAssertionNode(propertyAssertionNode, context) {
-    const { Term, Property } = dom,
+    const { Term, Property } = ontology,
           propertyRelationNode = propertyAssertionNode.getPropertyRelationNode(),
           node = propertyRelationNode,  ///
           string = context.nodeAsString(node),

package/src/{dom → ontology}/reference.js

@@ -1,14 +1,14 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 import Substitutions from "../substitutions";
 
-import { domAssigned } from "../dom";
-import { referenceMetaType } from "../dom/metaType";
+import { define } from "../ontology";
+import { referenceMetaType } from ".//metaType";
 import { unifyMetavariableIntrinsically } from "../utilities/unification";
 import { metavariableFromJSON, metavariableToMetavariableJSON } from "../utilities/json";
 
-export default domAssigned(class Reference {
+export default define(class Reference {
   constructor(metavariable) {
     this.metavariable = metavariable;
   }
@@ -222,7 +222,7 @@ export default domAssigned(class Reference {
 });
 
 function referenceFromReferenceNode(referenceNode, context) {
-  const { Reference, Metavariable } = dom,
+  const { Reference, Metavariable } = ontology,
         metavariable = Metavariable.fromReferenceNode(referenceNode, context),
         reference = new Reference(metavariable);
 
@@ -230,7 +230,7 @@ function referenceFromReferenceNode(referenceNode, context) {
 }
 
 function referenceFromMetavariableNode(metavariableNode, context) {
-  const { Reference, Metavariable } = dom,
+  const { Reference, Metavariable } = ontology,
         metavariable = Metavariable.fromMetavariableNode(metavariableNode, context),
         reference = new Reference(metavariable);
 

package/src/{dom → ontology}/rule.js

@@ -2,11 +2,11 @@
 
 import { arrayUtilities } from "necessary";
 
-import dom from "../dom";
+import ontology from "../ontology";
 import LocalContext from "../context/local";
 import Substitutions from "../substitutions";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 import { labelsStringFromLabels } from "./topLevelAssertion";
 import { labelsFromJSON,
          premisesFromJSON,
@@ -17,7 +17,7 @@ import { labelsFromJSON,
 
 const { reverse, extract, backwardsEvery } = arrayUtilities;
 
-export default domAssigned(class Rule {
+export default define(class Rule {
   constructor(context, node, string, labels, premises, conclusion, proof) {
     this.context = context;
     this.node = node;
@@ -283,7 +283,7 @@ export default domAssigned(class Rule {
 });
 
 function proofFromRuleNode(ruleNode, context) {
-  const { Proof } = dom,
+  const { Proof } = ontology,
         proofNode = ruleNode.getProofNode(),
         proof = Proof.fromProofNode(proofNode, context);
 
@@ -291,7 +291,7 @@ function proofFromRuleNode(ruleNode, context) {
 }
 
 function labelsFromRuleNode(ruleNode, context) {
-  const { Label } = dom,
+  const { Label } = ontology,
         labelNodes = ruleNode.getLabelNodes(),
         labels = labelNodes.map((labelNode) => {
           const label = Label.fromLabelNode(labelNode, context);
@@ -303,7 +303,7 @@ function labelsFromRuleNode(ruleNode, context) {
 }
 
 function premisesFromRuleNode(ruleNode, context) {
-  const { Premise } = dom,
+  const { Premise } = ontology,
         premiseNodes = ruleNode.getPremiseNodes(),
         premises = premiseNodes.map((premiseNode) => {
           const premise = Premise.fromPremiseNode(premiseNode, context);
@@ -315,7 +315,7 @@ function premisesFromRuleNode(ruleNode, context) {
 }
 
 function conclusionFromRuleNode(ruleNode, context) {
-  const { Conclusion } = dom,
+  const { Conclusion } = ontology,
         conclusionNode = ruleNode.getConclusionNode(),
         conclusion = Conclusion.fromConclusionNode(conclusionNode, context);
 

package/src/{dom → ontology}/section.js

@@ -1,11 +1,11 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 import LocalContext from "../context/local";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 
-export default domAssigned(class Section {
+export default define(class Section {
   constructor(context, node, string, hypotheses, axiom, lemma, theorem, conjecture) {
     this.context = context;
     this.node = node;
@@ -115,7 +115,7 @@ function axiomFroSectionNode(sectionNode, context) {
   const axiomNode = sectionNode.getAxiomNode();
 
   if (axiomNode !== null) {
-    const { Axiom } = dom;
+    const { Axiom } = ontology;
 
     axiom = Axiom.fromAxiomNode(axiomNode, context);
   }
@@ -129,7 +129,7 @@ function lemmaFroSectionNode(sectionNode, context) {
   const lemmaNode = sectionNode.getLemmaNode();
 
   if (lemmaNode !== null) {
-    const { Lemma } = dom;
+    const { Lemma } = ontology;
 
     lemma = Lemma.fromLemmaNode(lemmaNode, context);
   }
@@ -143,7 +143,7 @@ function theoremFroSectionNode(sectionNode, context) {
   const theoremNode = sectionNode.getTheoremNode();
 
   if (theoremNode !== null) {
-    const { Theorem } = dom;
+    const { Theorem } = ontology;
 
     theorem = Theorem.fromTheoremNode(theoremNode, context);
   }
@@ -157,7 +157,7 @@ function conjectureFroSectionNode(sectionNode, context) {
   const conjectureNode = sectionNode.getConjectureNode();
 
   if (conjectureNode !== null) {
-    const { Conjecture } = dom;
+    const { Conjecture } = ontology;
 
     conjecture = Conjecture.fromConjectureNode(conjectureNode, context);
   }
@@ -167,7 +167,7 @@ function conjectureFroSectionNode(sectionNode, context) {
 
 function hypothesesFromHypothesisNodes(hypothesisNodes, context) {
   const hypotheses = hypothesisNodes.map((hypothesisNode) => {
-    const { Hypothesis } = dom,
+    const { Hypothesis } = ontology,
           hypothesis = Hypothesis.fromHypothesisNode(hypothesisNode, context);
 
     return hypothesis;

package/src/{dom → ontology}/signature.js

@@ -2,15 +2,15 @@
 
 import { arrayUtilities } from "necessary";
 
-import dom from "../dom";
+import ontology from "../ontology";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 import { termsFromJSON, termsToTermsJSON } from "../utilities/json";
 import { stringFromTerms, variableFromTerm, termsFromTermNodes } from "../utilities/node";
 
 const { match, compare, correlate } = arrayUtilities;
 
-export default domAssigned(class Signature {
+export default define(class Signature {
   constructor(string, terms) {
     this.string = string;
     this.terms = terms;
@@ -73,7 +73,7 @@ export default domAssigned(class Signature {
 
               term = termA; ///
 
-              const { TermSubstitution } = dom,
+              const { TermSubstitution } = ontology,
                     termSubstitution = TermSubstitution.fromTernAndVariable(term, variable, context),
                     substitution = termSubstitution;  ///
 

package/src/{dom → ontology}/statement.js

@@ -5,7 +5,7 @@ import { arrayUtilities } from "necessary";
 import verifyMixins from "../mixins/statement/verify";
 import StatementPartialContext from "../context/partial/statement";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 import { unifyStatement } from "../utilities/unification";
 import { STATEMENT_META_TYPE_NAME } from "../metaTypeNames";
 import { statementFromStatementNode } from "../utilities/node";
@@ -14,7 +14,7 @@ import { definedAssertionFromStatement, containedAssertionFromStatement, subproo
 
 const { match, backwardsSome } = arrayUtilities;
 
-export default domAssigned(class Statement {
+export default define(class Statement {
   constructor(string, node, tokens) {
     this.string = string;
     this.node = node;

package/src/{dom → ontology}/step.js

@@ -1,14 +1,14 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 import unifyMixins from "../mixins/step/unify";
 import Substitutions from "../substitutions";
 import equationalUnifier from "../unifier/equantional";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 import { propertyAssertionFromStatement } from "../utilities/context";
 
-export default domAssigned(class Step {
+export default define(class Step {
   constructor(node, string, statement, reference, satisfiesAssertion) {
     this.node = node;
     this.string = string;
@@ -207,7 +207,7 @@ export default domAssigned(class Step {
     const stepNode = stepOrSubproofNode.isStepNode();
 
     if (stepNode) {
-      const { Statement, Reference, SatisfiesAssertion } = dom,
+      const { Statement, Reference, SatisfiesAssertion } = ontology,
             stepNode = stepOrSubproofNode,  ///
             node = stepNode, ///
             string = context.nodeAsString(node),

package/src/{dom → ontology}/subDerivation.js

@@ -2,14 +2,14 @@
 
 import { arrayUtilities } from "necessary";
 
-import dom from "../dom";
+import ontology from "../ontology";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 import { assignAssignments } from "../utilities/assignments";
 
 const { last } = arrayUtilities;
 
-export default domAssigned(class SubDerivation {
+export default define(class SubDerivation {
   constructor(stepsOrSubproofs) {
     this.stepsOrSubproofs = stepsOrSubproofs;
   }
@@ -61,7 +61,7 @@ export default domAssigned(class SubDerivation {
 });
 
 function stepOrSubproofFromSubDerivationNode(subDerivationNode, context) {
-  const { Step, Subproof } = dom,
+  const { Step, Subproof } = ontology,
         stepOrSubproofNodes = subDerivationNode.getStepOrSubproofNodes(),
         stepsOrSubproofs = stepOrSubproofNodes.map((stepOrSubproofNode) => {
           const subproof = Subproof.fromStepOrSubproofNode(stepOrSubproofNode, context),

package/src/{dom → ontology}/subproof.js

@@ -1,13 +1,13 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 import LocalContext from "../context/local";
 import Substitutions from "../substitutions";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 import { subproofStringFromSubproofNode } from "../utilities/subproof";
 
-export default domAssigned(class Subproof {
+export default define(class Subproof {
   constructor(node, string, suppositions, subDerivation) {
     this.node = node;
     this.string = string;
@@ -154,7 +154,7 @@ export default domAssigned(class Subproof {
 });
 
 function suppositionsFromSubproofNode(subproofNode, context) {
-  const { Supposition } = dom,
+  const { Supposition } = ontology,
         suppositionNodes = subproofNode.getSuppositionNodes(),
         suppositions = suppositionNodes.map((suppositionNode) => {
           const supposition = Supposition.fromSuppositionNode(suppositionNode, context);
@@ -166,7 +166,7 @@ function suppositionsFromSubproofNode(subproofNode, context) {
 }
 
 function subDerivationFromSubproofNode(subproofNode, context) {
-  const { SubDerivation } = dom,
+  const { SubDerivation } = ontology,
         subDerivationNode = subproofNode.getSubDerivationNode(),
         subDerivation = SubDerivation.fromSubDerivationNode(subDerivationNode, context);
 

package/src/{dom → ontology}/substitution/frame.js

@@ -1,12 +1,12 @@
 "use strict";
 
-import dom from "../../dom";
+import ontology from "../../ontology";
 import Substitution from "../substitution";
 import FrameSubstitutionPartialContext from "../../context/partial/substitution/frame";
 
-import { domAssigned } from "../../dom";
+import { define } from "../../ontology";
 
-export default domAssigned(class FrameSubstitution extends Substitution {
+export default define(class FrameSubstitution extends Substitution {
   constructor(string, node, tokens, frame, metavariable) {
     super(string, node, tokens);
 
@@ -46,7 +46,7 @@ export default domAssigned(class FrameSubstitution extends Substitution {
             singularMetavariableNode = lastFrameNode.getSingularMetavariableNode();
 
       if (singularMetavariableNode !== null) {
-        const { Frame, Metavariable } = dom,
+        const { Frame, Metavariable } = ontology,
               frameNode = firstFrameNode, ///
               metavariableNode = singularMetavariableNode,  ///
               frame = Frame.fromFrameNode(frameNode, context),

package/src/{dom → ontology}/substitution/reference.js

@@ -3,9 +3,9 @@
 import Substitution from "../substitution";
 import ReferenceSubstitutionPartialContext from "../../context/partial/substitution/reference";
 
-import { domAssigned } from "../../dom";
+import { define } from "../../ontology";
 
-export default domAssigned(class ReferenceSubstitution extends Substitution {
+export default define(class ReferenceSubstitution extends Substitution {
   constructor(string, node, tokens, reference, metavariable) {
     super(string, node, tokens);
 

package/src/{dom → ontology}/substitution/statement.js

@@ -4,12 +4,12 @@ import Substitution from "../substitution";
 import Substitutions from "../../substitutions";
 import StatementSubstitutionPartialContext from "../../context/partial/substitution/statement";
 
-import { domAssigned } from "../../dom";
+import { define } from "../../ontology";
 import { unifySubstitution } from "../../utilities/unification";
 import { stripBracketsFromStatement } from "../../utilities/brackets";
 import { statementFromJSON, statementToStatementJSON, metavariableFromJSON, metavariableToMetavariableJSON } from "../../utilities/json";
 
-export default domAssigned(class StatementSubstitution extends Substitution {
+export default define(class StatementSubstitution extends Substitution {
   constructor(string, node, tokens, resolved, statement, metavariable, substitution) {
     super(string, node, tokens);
 

package/src/{dom → ontology}/substitution/term.js

@@ -1,14 +1,14 @@
 "use strict";
 
-import dom from "../../dom";
+import ontology from "../../ontology";
 import Substitution from "../substitution";
 import TermSubstitutionPartialContext from "../../context/partial/substitution/term";
 
-import { domAssigned } from "../../dom";
+import { define } from "../../ontology";
 import { stripBracketsFromTerm } from "../../utilities/brackets";
 import { stripBracketsFromTermNode } from "../../utilities/brackets";
 
-export default domAssigned(class TermSubstitution extends Substitution {
+export default define(class TermSubstitution extends Substitution {
   constructor(string, node, tokens, term, variable) {
     super(string, node, tokens);
 
@@ -62,7 +62,7 @@ export default domAssigned(class TermSubstitution extends Substitution {
             singularVariableNode = lastTermNode.getSingularVariableNode(lastTermNode);
 
       if (singularVariableNode !== null) {
-        const { Term, Variable } = dom,
+        const { Term, Variable } = ontology,
               termNode = firstTermNode, ///
               variableNode = singularVariableNode,  ///
               term = Term.fromTermNode(termNode, context),
@@ -83,7 +83,7 @@ export default domAssigned(class TermSubstitution extends Substitution {
 
     termNode = stripBracketsFromTermNode(termNode); ///
 
-    const { Term } = dom;
+    const { Term } = ontology;
 
     term = Term.fromTermNode(termNode, context);
 

package/src/{dom → ontology}/supposition.js

@@ -1,13 +1,13 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 import { assignAssignments } from "../utilities/assignments";
 import { subproofAssertionFromStatement } from "../utilities/context";
 import { statementFromJSON, procedureCallFromJSON, statementToStatementJSON, procedureCallToProcedureCallJSON } from "../utilities/json";
 
-export default domAssigned(class Supposition {
+export default define(class Supposition {
   constructor(node, string, statement, procedureCall) {
     this.node = node;
     this.string = string;
@@ -49,7 +49,7 @@ export default domAssigned(class Supposition {
         const assignmentsAssigned = assignAssignments(assignments, context);
 
         if (assignmentsAssigned) {
-          const { Step } = dom,
+          const { Step } = ontology,
                 step = Step.fromStatement(this.statement, context),
                 stepOrSubproof = step;  ///
 
@@ -246,7 +246,7 @@ export default domAssigned(class Supposition {
   }
 
   static fromSuppositionNode(suppositionNode, context) {
-    const { Statement, ProcedureCall } = dom,
+    const { Statement, ProcedureCall } = ontology,
           node = suppositionNode, ///
           string = context.nodeAsString(node),
           statement = Statement.fromSuppositionNode(suppositionNode, context),

package/src/{dom → ontology}/term.js

@@ -2,17 +2,17 @@
 
 import { arrayUtilities } from "necessary";
 
-import dom from "../dom";
+import ontology from "../ontology";
 import verifyMixins from "../mixins/term/verify";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 import { termFromTermNode } from "../utilities/node";
 import { termNodeFromTermString } from "../context/partial/term";
 import { typeFromJSON, typeToTypeJSON } from "../utilities/json";
 
 const { filter, compress } = arrayUtilities;
 
-export default domAssigned(class Term {
+export default define(class Term {
   constructor(string, node, type) {
     this.string = string;
     this.node = node;
@@ -36,7 +36,7 @@ export default domAssigned(class Term {
   }
 
   getVariable(context) {
-    const { Variable } = dom,
+    const { Variable } = ontology,
           termNode = this.node, ///
           variable = Variable.fromTermNode(termNode, context);
 
@@ -47,7 +47,7 @@ export default domAssigned(class Term {
     const termNode = this.node,
           variableNodes = termNode.getVariableNodes(),
           variables = variableNodes.map((variableNode) => {
-            const { Variable } = dom,
+            const { Variable } = ontology,
                   variable = Variable.fromVariableNode(variableNode, context);
 
             return variable;
@@ -263,7 +263,7 @@ export default domAssigned(class Term {
   }
 
   static fromConstructorDeclarationNode(constructorDeclarationNode, context) {
-    const { Type } = dom,
+    const { Type } = ontology,
           termNode = constructorDeclarationNode.getTermNode(),
           term = termFromTermNode(termNode, context),
           type = Type.fromConstructorDeclarationNode(constructorDeclarationNode, context);

package/src/{dom → ontology}/theorem.js

@@ -2,9 +2,9 @@
 
 import TopLevelAssertion from "./topLevelAssertion";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 
-export default domAssigned(class Theorem extends TopLevelAssertion {
+export default define(class Theorem extends TopLevelAssertion {
   verify() {
     let verifies;