occam-verify-cli 1.0.383 → 1.0.385

package/src/{dom → ontology}/constructor/bracketed.js

@@ -1,12 +1,12 @@
 "use strict";
 
-import dom from "../../dom";
+import ontology from "../../ontology";
 import Constructor from "../constructor";
 import constructorBracketedContext from "../../context/bracketed/constructor";
 
-import { domAssigned } from "../../dom";
+import { define } from "../../ontology";
 
-export default domAssigned(class BracketedConstructor extends Constructor {
+export default define(class BracketedConstructor extends Constructor {
   unifyTerm(term, context, verifyAhead) {
     let termUnifies;
 
@@ -17,7 +17,7 @@ export default domAssigned(class BracketedConstructor extends Constructor {
     termUnifies = super.unifyTerm(term, context, () => {
       let verifiesAhead = false;
 
-      const { Term } = dom,
+      const { Term } = ontology,
             bracketedTerm = term, ///
             bracketedTermNode = bracketedTerm.getNode(),
             singularTermNode = bracketedTermNode.getSingularTermNode();
@@ -53,7 +53,7 @@ export default domAssigned(class BracketedConstructor extends Constructor {
   }
 
   static fromNothing() {
-    const { Term } = dom,
+    const { Term } = ontology,
           bracketedTermNode = constructorBracketedContext.getBracketedTermNode(),
           termNode = bracketedTermNode,  ///
           context = constructorBracketedContext, ///

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

@@ -1,13 +1,13 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 
-import { baseType } from "../dom/type";
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
+import { baseType } from ".//type";
 import { unifyTermWithConstructor } from "../utilities/unification";
 import { termFromJSON, termToTermJSON } from "../utilities/json";
 
-export default domAssigned(class Constructor {
+export default define(class Constructor {
   constructor(string, term) {
     this.string = string;
     this.term = term;
@@ -76,7 +76,7 @@ export default domAssigned(class Constructor {
   }
 
   static fromConstructorDeclarationNode(constructorDeclarationNode, context) {
-    const { Term } = dom,
+    const { Term } = ontology,
           term = Term.fromConstructorDeclarationNode(constructorDeclarationNode, context),
           string = stringFromTerm(term),
           constructor = new Constructor(string, term);

package/src/{dom → ontology}/declaration/combinator.js

@@ -1,12 +1,12 @@
 "use strict";
 
-import dom from "../../dom";
+import ontology from "../../ontology";
 
-import { domAssigned } from "../../dom";
+import { define } from "../../ontology";
 
 import combinatorVerifier from "../../verifier/combinator";
 
-export default domAssigned(class CombinatorDeclaration {
+export default define(class CombinatorDeclaration {
   constructor(context, node, string, combinator) {
     this.context = context;
     this.node = node;
@@ -74,7 +74,7 @@ export default domAssigned(class CombinatorDeclaration {
   static name = "CombinatorDeclaration";
 
   static fromCombinatorDeclarationNode(combinatorDeclarationNode, context) {
-    const { Combinator } = dom,
+    const { Combinator } = ontology,
           node = combinatorDeclarationNode, ///
           string = context.nodeAsString(node),
           combinator = Combinator.fromCombinatorDeclarationNode(combinatorDeclarationNode, context),

package/src/{dom → ontology}/declaration/complexType.js

@@ -1,11 +1,11 @@
 "use strict";
 
-import dom from "../../dom";
+import ontology from "../../ontology";
 
-import { domAssigned } from "../../dom";
+import { define } from "../../ontology";
 import { stringFromTypeNameTypePrefixNameAndSuperTypes } from "../../utilities/type";
 
-export default domAssigned(class ComplexTypeDeclaration {
+export default define(class ComplexTypeDeclaration {
   constructor(context, node, string, type, prefixed) {
     this.context = context;
     this.node = node;
@@ -311,7 +311,7 @@ export default domAssigned(class ComplexTypeDeclaration {
   static name = "ComplexTypeDeclaration";
 
   static fromComplexTypeDeclarationNode(complexTypeDeclarationNode, context) {
-    const { Type } = dom,
+    const { Type } = ontology,
           type = Type.fromComplexTypeDeclarationNode(complexTypeDeclarationNode, context),
           node = complexTypeDeclarationNode,  ///
           prefixed = complexTypeDeclarationNode.isPrefixed(),

package/src/{dom → ontology}/declaration/constructor.js

@@ -1,12 +1,12 @@
 "use strict";
 
-import dom from "../../dom";
+import ontology from "../../ontology";
 
 import constructorVerifier from "../../verifier/constructor";
 
-import { domAssigned } from "../../dom";
+import { define } from "../../ontology";
 
-export default domAssigned(class ConstructorDeclaration {
+export default define(class ConstructorDeclaration {
   constructor(context, node, string, constructor) {
     this.context = context;
     this.node = node;
@@ -120,7 +120,7 @@ export default domAssigned(class ConstructorDeclaration {
   static name = "ConstructorDeclaration";
 
   static fromConstructorDeclarationNode(constructorDeclarationNode, context) {
-    const { Constructor } = dom,
+    const { Constructor } = ontology,
           node = constructorDeclarationNode,  ///
           string = context.nodeAsString(node),
           constructor = Constructor.fromConstructorDeclarationNode(constructorDeclarationNode, context),

package/src/{dom → ontology}/declaration/metavariable.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 MetavariableDeclaration {
+export default define(class MetavariableDeclaration {
   constructor(context, node, string, metavariable) {
     this.context = context;
     this.node = node;
@@ -113,7 +113,7 @@ export default domAssigned(class MetavariableDeclaration {
   static name = "MetavariableDeclaration";
 
   static fromMetavariableDeclarationNode(metavariableDeclarationNode, context) {
-    const { Metavariable } = dom,
+    const { Metavariable } = ontology,
           node = metavariableDeclarationNode, ///
           metaType = metaTypeFromMetavariableDeclarationNode(metavariableDeclarationNode, context),
           metavariable = Metavariable.fromMetavariableDeclarationNode(metavariableDeclarationNode, context),
@@ -141,7 +141,7 @@ function stringFromMetavariableAndMetaType(metavariable, metaType) {
 }
 
 function metaTypeFromMetavariableDeclarationNode(metavariableDeclarationNode, context) {
-  const { MetaType } = dom,
+  const { MetaType } = ontology,
         metaTypeNode = metavariableDeclarationNode.getMetaTypeNode(),
         metaType = MetaType.fromMetaTypeNode(metaTypeNode, context);
 

package/src/{dom → ontology}/declaration/simpleType.js

@@ -1,11 +1,11 @@
 "use strict";
 
-import dom from "../../dom";
+import ontology from "../../ontology";
 
-import { domAssigned } from "../../dom";
+import { define } from "../../ontology";
 import { stringFromTypeNameTypePrefixNameAndSuperTypes } from "../../utilities/type";
 
-export default domAssigned(class SimpleTypeDeclaration {
+export default define(class SimpleTypeDeclaration {
   constructor(context, node, string, type, prefixed) {
     this.context = context;
     this.node = node;
@@ -178,7 +178,7 @@ export default domAssigned(class SimpleTypeDeclaration {
   static name = "SimpleTypeDeclaration";
 
   static fromSimpleTypeDeclarationNode(simpleTypeDeclarationNode, context) {
-    const { Type } = dom,
+    const { Type } = ontology,
           type = Type.fromSimpleTypeDeclarationNode(simpleTypeDeclarationNode, context),
           node = simpleTypeDeclarationNode, ///
           prefixed = simpleTypeDeclarationNode.isPrefixed(),

package/src/{dom → ontology}/declaration/typePrefix.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 TypePrefixDeclaration {
+export default define(class TypePrefixDeclaration {
   constructor(context, node, string, typePrefix) {
     this.context = context;
     this.node = node;
@@ -99,7 +99,7 @@ export default domAssigned(class TypePrefixDeclaration {
   static name = "TypePrefixDeclaration";
 
   static fromTypePrefixDeclarationNode(typePrefixDeclarationNode, context) {
-    const { TypePrefix } = dom,
+    const { TypePrefix } = ontology,
           node = typePrefixDeclarationNode, ///
           typePrefix = TypePrefix.fromTypePrefixDeclarationNode(typePrefixDeclarationNode, context),
           typePrefixName = typePrefix.getName(),

package/src/{dom → ontology}/declaration/variable.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 VariableDeclaration {
+export default define(class VariableDeclaration {
   constructor(context, node, string, variable) {
     this.context = context;
     this.node = node;
@@ -122,7 +122,7 @@ export default domAssigned(class VariableDeclaration {
   static name = "VariableDeclaration";
 
   static fromVariableDeclarationNode(variableDeclarationNode, context) {
-    const { Variable } = dom,
+    const { Variable } = ontology,
           node = variableDeclarationNode, ///
           string = context.nodeAsString(node),
           variable = Variable.fromVariableDeclarationNode(variableDeclarationNode, context),

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

@@ -1,12 +1,12 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 import Substitutions from "../substitutions";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 import { unifyStatementIntrinsically } from "../utilities/unification";
 
-export default domAssigned(class Declaration {
+export default define(class Declaration {
   constructor(string, node, statement, metavariable) {
     this.string = string;
     this.node = node;
@@ -333,7 +333,7 @@ export default domAssigned(class Declaration {
 });
 
 function referenceFromMetavariable(metavariable, context) {
-  const { Reference } = dom,
+  const { Reference } = ontology,
         metavariableNode = metavariable.getNode(),
         reference = Reference.fromMetavariableNode(metavariableNode, context);
 
@@ -341,7 +341,7 @@ function referenceFromMetavariable(metavariable, context) {
 }
 
 function declarationFromDeclarationNode(declarationNode, context) {
-  const { Metavariable, Declaration, Statement } = dom,
+  const { Metavariable, Declaration, Statement } = ontology,
         node = declarationNode,  ///
         string = context.nodeAsString(node),
         metavariable = Metavariable.fromDeclarationNode(declarationNode, context),

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

@@ -1,11 +1,11 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 import { statementFromJSON, statementToStatementJSON } from "../utilities/json";
 
-export default domAssigned(class Deduction {
+export default define(class Deduction {
   constructor(node, string, statement) {
     this.node = node;
     this.string = string;
@@ -110,7 +110,7 @@ export default domAssigned(class Deduction {
   }
 
   static fromDeductionNode(deductionNode, context) {
-    const { Statement } = dom,
+    const { Statement } = ontology,
           node = deductionNode,  ///
           string = context.nodeAsString(node),
           statement = Statement.fromDeductionNode(deductionNode, context),

package/src/{dom → ontology}/derivation.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 Derivation {
+export default define(class Derivation {
   constructor(stepsOrSubproofs) {
     this.stepsOrSubproofs = stepsOrSubproofs;
   }
@@ -61,7 +61,7 @@ export default domAssigned(class Derivation {
 });
 
 function stepsOrSubproofsFromDerivationNode(derivationNode, context) {
-  const { Step, Subproof } = dom,
+  const { Step, Subproof } = ontology,
         stepOrSubproofNodes = derivationNode.getStepOrSubproofNodes(),
         stepsOrSubproofs = stepOrSubproofNodes.map((stepOrSubproofNode) => {
           let stepOrSubproof;

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

@@ -1,13 +1,13 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 import equationalUnifier from "../unifier/equantional";
 import EqualityAssignment from "../assignment/equality";
 import VariableAssignment from "../assignment/variable";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 
-export default domAssigned(class Equality {
+export default define(class Equality {
   constructor(string, leftTerm, rightTerm) {
     this.string = string;
     this.leftTerm = leftTerm;
@@ -186,7 +186,7 @@ export default domAssigned(class Equality {
       return;
     }
 
-    const { Variable } = dom,
+    const { Variable } = ontology,
           type = this.getType(),
           leftTermNode = this.leftTerm.getNode(),
           rightTermNode = this.rightTerm.getNode(),
@@ -244,7 +244,7 @@ export default domAssigned(class Equality {
 });
 
 function leftTermFromEqualityNode(equalityNode, context) {
-  const { Term } = dom,
+  const { Term } = ontology,
         leftTermNode = equalityNode.getLeftTermNode(),
         leftTerm = Term.fromTermNode(leftTermNode, context);
 
@@ -252,7 +252,7 @@ function leftTermFromEqualityNode(equalityNode, context) {
 }
 
 function rightTermFromEqualityNode(equalityNode, context) {
-  const { Term } = dom,
+  const { Term } = ontology,
         rightTermNode = equalityNode.getRightTermNode(),
         rightTerm = Term.fromTermNode(rightTermNode, context);
 

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

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

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

@@ -2,15 +2,15 @@
 
 import { arrayUtilities } from "necessary";
 
-import dom from "../dom";
+import ontology from "../ontology";
 
+import { define } from "../ontology";
 import { S, NOTHING } from "../constants";
-import { domAssigned } from "../dom";
 import { FRAME_META_TYPE_NAME } from "../metaTypeNames";
 
 const { first } = arrayUtilities;
 
-export default domAssigned(class Frame {
+export default define(class Frame {
   constructor(string, node, tokens, declarations) {
     this.string = string;
     this.node = node;
@@ -289,7 +289,7 @@ export default domAssigned(class Frame {
 });
 
 function frameFromFrameNode(frameNode, context) {
-  const { Frame } = dom,
+  const { Frame } = ontology,
         node = frameNode, ///
         string = context.nodeAsString(node),
         tokens = context.nodeAsTokens(node),
@@ -301,7 +301,7 @@ function frameFromFrameNode(frameNode, context) {
 }
 
 function declarationsFromFrameNode(frameNode, context) {
-  const { Declaration } = dom,
+  const { Declaration } = ontology,
         declarationNodes = frameNode.getDeclarationNodes(),
         declarations = declarationNodes.map((declarationNode) => {
           const declaration = Declaration.fromDeclarationNode(declarationNode, context);
@@ -313,7 +313,7 @@ function declarationsFromFrameNode(frameNode, context) {
 }
 
 function metavariablesFromFrameNode(frameNode, context) {
-  const { Metavariable } = dom,
+  const { Metavariable } = ontology,
         metavariableNodes = frameNode.getMetavariableNodes(),
         metavariables = metavariableNodes.map((metavariableNode) => {
           const metavariable = Metavariable.fromMetavariableNode(metavariableNode, context);

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

@@ -1,13 +1,12 @@
 "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, statementToStatementJSON } from "../utilities/json";
 
-export default domAssigned(class Hypothesis {
+export default define(class Hypothesis {
   constructor(node, string, statement) {
     this.node = node;
     this.string = string;
@@ -44,7 +43,7 @@ export default domAssigned(class Hypothesis {
         const assignmentsAssigned = assignAssignments(assignments, context);
 
         if (assignmentsAssigned) {
-          const { Step } = dom,
+          const { Step } = ontology,
                 step = Step.fromStatement(this.statement, context),
                 stepOrSubproof = step;  ///
 
@@ -114,7 +113,7 @@ export default domAssigned(class Hypothesis {
   }
 
   static fromHypothesisNode(hypothesisNode, context) {
-    const { Statement } = dom,
+    const { Statement } = ontology,
           node = hypothesisNode, ///
           string = context.nodeAsString(node),
           statement = Statement.fromHypothesisNode(hypothesisNode, context),

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

@@ -1,11 +1,11 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 import JudgementAssignment from "../assignment/judgement";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 
-export default domAssigned(class Judgement {
+export default define(class Judgement {
   constructor(string, frame, declaration) {
     this.string = string;
     this.frame = frame;
@@ -151,7 +151,7 @@ export default domAssigned(class Judgement {
     const judgementNode = statementNode.getJudgementNode();
 
     if (judgementNode !== null) {
-      const { Frame, Declaration} = dom,
+      const { Frame, Declaration} = ontology,
             node = judgementNode, ///
             string = context.nodeAsString(node),
             frame = Frame.fromJudgementNode(judgementNode, context),
@@ -165,7 +165,7 @@ export default domAssigned(class Judgement {
 });
 
 function referenceFromMetavariable(metavariable, context) {
-  const { Reference } = dom,
+  const { Reference } = ontology,
         metavariableNode = metavariable.getNode(),
         reference = Reference.fromMetavariableNode(metavariableNode, context);
 

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

@@ -1,11 +1,11 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 import { metavariableFromJSON, metavariableToMetavariableJSON } from "../utilities/json";
 
-export default domAssigned(class Label {
+export default define(class Label {
   constructor(context, metavariable) {
     this.context = context;
     this.metavariable = metavariable;
@@ -102,7 +102,7 @@ export default domAssigned(class Label {
   }
 
   static fromLabelNode(labelNode, context) {
-    const { Metavariable } = dom,
+    const { Metavariable } = ontology,
           metavariable = Metavariable.fromLabelNode(labelNode, context),
           label = new Label(context, metavariable);
 

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

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

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

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

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

@@ -1,6 +1,6 @@
 "use strict";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 import { FRAME_META_TYPE_NAME, REFERENCE_META_TYPE_NAME, STATEMENT_META_TYPE_NAME } from "../metaTypeNames";
 
 class MetaType {
@@ -70,7 +70,7 @@ function metaTypeFromMetaTypeNode(metaTypeNode, context) {
   return metaType;
 }
 
-export default domAssigned(MetaType);
+export default define(MetaType);
 
 class FrameMetaType extends MetaType {
   static fromNothing() {

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

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

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

@@ -1,16 +1,16 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 import MetavariablePartialContext from "../context/partial/metavariable";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 import { EMPTY_STRING } from "../constants";
 import { typeFromJSON, typeToTypeJSON } from "../utilities/json";
 import { metaTypeFromJSON, metaTypeToMetaTypeJSON } from "../utilities/json";
 import { metavariableFromFrame, metavariableFromStatement } from "../utilities/context";
 import { unifyMetavariable, unifyMetavariableIntrinsically } from "../utilities/unification";
 
-export default domAssigned(class Metavariable {
+export default define(class Metavariable {
   constructor(string, node, tokens, name, type, metaType) {
     this.string = string;
     this.node = node;
@@ -161,7 +161,7 @@ export default domAssigned(class Metavariable {
           frameUnifies = true;
         }
       } else {
-        const { FrameSubstitution } = dom,
+        const { FrameSubstitution } = ontology,
               context = specificContext,  ///
               metavariable = this,  ///
               frameSubstitution = FrameSubstitution.fromFrameAndMetavariable(frame, metavariable, context),
@@ -206,7 +206,7 @@ export default domAssigned(class Metavariable {
           referenceUnifies = true;
         }
       } else {
-        const { ReferenceSubstitution } = dom,
+        const { ReferenceSubstitution } = ontology,
               metavariable = this,
               referenceSubstitution = ReferenceSubstitution.fromReferenceAndMetavariable(reference, metavariable, context),
               substitution = referenceSubstitution;  ///
@@ -253,7 +253,7 @@ export default domAssigned(class Metavariable {
           statementUnifies = true;
         }
       } else {
-        const { StatementSubstitution } = dom,
+        const { StatementSubstitution } = ontology,
               metavariable = this,
               statementSubstitution = StatementSubstitution.fromStatementMetavariableAndSubstitution(statement, metavariable, substitution, context);
 
@@ -495,7 +495,7 @@ export default domAssigned(class Metavariable {
   }
 
   static fromMetavariableDeclarationNode(metavariableDeclarationNode, context) {
-    const { MetaType } = dom,
+    const { MetaType } = ontology,
           metavariableNode = metavariableDeclarationNode.getMetavariableNode(),
           type = typeFromMetavariableDeclarationNode(metavariableDeclarationNode, context),
           metaType = MetaType.fromMetavariableDeclarationNode(metavariableDeclarationNode, context),
@@ -510,7 +510,7 @@ export default domAssigned(class Metavariable {
 });
 
 function metavariableFromMetavariableNode(metavariableNode, context) {
-  const { Metavariable } = dom,
+  const { Metavariable } = ontology,
         metavariableName = metavariableNode.getMetavariableName(),
         type = null,
         name = metavariableName,  ///

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

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