occam-verify-cli 1.0.383 → 1.0.386

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

@@ -2,7 +2,7 @@
 
 import { arrayUtilities } from "necessary";
 
-import dom from "../dom";
+import ontology from "../ontology";
 import LocalContext from "../context/local";
 import Substitutions from "../substitutions";
 
@@ -346,14 +346,14 @@ export default class TopLevelAssertion {
 }
 
 export function proofFromProofNode(proofNode, context) {
-  const { Proof } = dom,
+  const { Proof } = ontology,
         proof = Proof.fromProofNode(proofNode, context);
 
   return proof;
 }
 
 export function labelsFromLabelNodes(labelNodes, context) {
-  const { Label } = dom,
+  const { Label } = ontology,
         labels = labelNodes.map((labelNode) => {
           const label = Label.fromLabelNode(labelNode, context);
 
@@ -367,7 +367,7 @@ export function signatureFromSignatureNode(signatureNode, context) {
   let signature = null;
 
   if (signatureNode !== null) {
-    const { Signature } = dom;
+    const { Signature } = ontology;
 
     signature = Signature.fromSignatureNode(signatureNode, context);
   }
@@ -376,14 +376,14 @@ export function signatureFromSignatureNode(signatureNode, context) {
 }
 
 export function deductionFromDeductionNode(deductionNode, context) {
-  const { Deduction } = dom,
+  const { Deduction } = ontology,
         deduction = Deduction.fromDeductionNode(deductionNode, context);
 
   return deduction;
 }
 
 export function suppositionsFromSuppositionNodes(suppositionNodes, context) {
-  const { Supposition } = dom,
+  const { Supposition } = ontology,
         suppositions = suppositionNodes.map((suppositionNode) => {
           const supposition = Supposition.fromSuppositionNode(suppositionNode, context);
 

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

@@ -1,6 +1,6 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 import LocalContext from "../context/local";
 import Substitutions from "../substitutions";
 
@@ -189,7 +189,7 @@ export default class TopLevelMetaAssertion {
 function labelFromLabelNode(labelNode, context) {
   let label = null;
 
-  const { Label } = dom;
+  const { Label } = ontology;
 
   if (labelNode !== null) {
     label = Label.fromLabelNode(labelNode, context);

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

@@ -2,9 +2,9 @@
 
 import { arrayUtilities } from "necessary";
 
-import dom from "../dom";
+import ontology from "../ontology";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 import { BASE_TYPE_SYMBOL } from "../constants";
 import { typeFromTypeNode } from "../utilities/node";
 import { stringFromTypeNameTypePrefixNameAndSuperTypes } from "../utilities/type";
@@ -405,7 +405,7 @@ class Type {
   }
 }
 
-export default domAssigned(Type);
+export default define(Type);
 
 function superTypesFromSimpleTypeDeclarationNode(simpleTypeDeclarationNode, context) {
   const superTypeNodes = simpleTypeDeclarationNode.getSuperTypeNodes(),
@@ -444,7 +444,7 @@ function superTypesFromComplexTypeDeclarationNode(complexTypeDeclarationNode, co
 }
 
 function propertiesFromComplexTypeDeclarationNode(complexTypeDeclarationNode, context) {
-  const { Property } = dom,
+  const { Property } = ontology,
         propertyDeclarationNodes = complexTypeDeclarationNode.getPropertyDeclarationNodes(),
         properties = propertyDeclarationNodes.map((propertyDeclarationNode) => {
           const property = Property.fromPropertyDeclarationNode(propertyDeclarationNode, context);

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

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

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

@@ -1,14 +1,14 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 
-import { domAssigned } from "../dom";
+import { define } from "../ontology";
 import { EMPTY_STRING } from "../constants";
 import { typeFromTypeNode } from "../utilities/node";
 import { typeFromJSON, typeToTypeJSON } from "../utilities/json";
 import { variableNodeFromVariableString } from "../context/partial/variable";
 
-export default domAssigned(class Variable {
+export default define(class Variable {
   constructor(string, node, type, identifier, propertyRelations) {
     this.string = string;
     this.node = node;
@@ -134,7 +134,7 @@ export default domAssigned(class Variable {
         termUnifies = true;
       }
     } else {
-      const { TermSubstitution } = dom,
+      const { TermSubstitution } = ontology,
             context = specificContext,  ///
             variable = this,  ///
             termSubstitution = TermSubstitution.fromTernAndVariable(term, variable, context),
@@ -214,7 +214,7 @@ export default domAssigned(class Variable {
   }
 
   static fromVariableDeclarationNode(variableDeclarationNode, context) {
-    const { Variable } = dom,
+    const { Variable } = ontology,
           provisional = variableDeclarationNode.isProvisional(),
           typeNode = variableDeclarationNode.getTypeNode(),
           type = typeFromTypeNode(typeNode, context);
@@ -255,7 +255,7 @@ export default domAssigned(class Variable {
 });
 
 function variableFromVariableNodeAndType(variableNode, type) {
-  const { Variable } = dom,
+  const { Variable } = ontology,
         node = variableNode,  ///
         variableIdentifier = variableNode.getVariableIdentifier(),
         string = variableIdentifier,  ///,

package/src/ontology.js

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

package/src/preamble.js

@@ -1,61 +1,61 @@
 "use strict";
 
-import Type from "./dom/type";
-import Term from "./dom/term";
-import Rule from "./dom/rule";
-import Step from "./dom/step";
-import Label from "./dom/label";
-import Axiom from "./dom/axiom";
-import Lemma from "./dom/lemma";
-import Frame from "./dom/frame";
-import Proof from "./dom/proof";
-import Error from "./dom/error";
-import Premise from "./dom/premise";
-import Theorem from "./dom/theorem";
-import Section from "./dom/section";
-import Equality from "./dom/equality";
-import MetaType from "./dom/metaType";
-import Subproof from "./dom/subproof";
-import Variable from "./dom/variable";
-import Property from "./dom/property";
-import Parameter from "./dom/parameter";
-import Reference from "./dom/reference";
-import Statement from "./dom/statement";
-import Judgement from "./dom/judgement";
-import MetaLemma from "./dom/metaLemma";
-import Deduction from "./dom/deduction";
-import Signature from "./dom/signature";
-import TypePrefix from "./dom/typePrefix";
-import Conjecture from "./dom/conjecture";
-import Conclusion from "./dom/conclusion";
-import Derivation from "./dom/derivation";
-import Combinator from "./dom/combinator";
-import Hypothesis from "./dom/hypothesis";
-import Constructor from "./dom/constructor";
-import Declaration from "./dom/declaration";
-import Supposition from "./dom/supposition";
-import Metatheorem from "./dom/metatheorem";
-import Metavariable from "./dom/metavariable";
-import ProcedureCall from "./dom/procedureCall";
-import SubDerivation from "./dom/subDerivation";
-import TypeAssertion from "./dom/assertion/type";
-import DefinedAssertion from "./dom/assertion/defined";
-import PropertyRelation from "./dom/propertyRelation";
-import TermSubstitution from "./dom/substitution/term";
-import FrameSubstitution from "./dom/substitution/frame";
-import SubproofAssertion from "./dom/assertion/subproof";
-import PropertyAssertion from "./dom/assertion/property";
-import ContainedAssertion from "./dom/assertion/contained";
-import SatisfiesAssertion from "./dom/assertion/satisfies";
-import ProcedureReference from "./dom/procedureReference";
-import VariableDeclaration from "./dom/declaration/variable";
-import BracketedCombinator from "./dom/combinator/bracketed";
-import BracketedConstructor from "./dom/constructor/bracketed";
-import SimpleTypeDeclaration from "./dom/declaration/simpleType";
-import StatementSubstitution from "./dom/substitution/statement";
-import ReferenceSubstitution from "./dom/substitution/reference";
-import CombinatorDeclaration from "./dom/declaration/combinator";
-import TypePrefixDeclaration from "./dom/declaration/typePrefix";
-import ConstructorDeclaration from "./dom/declaration/constructor";
-import ComplexTypeDeclaration from "./dom/declaration/complexType";
-import MetavariableDeclaration from "./dom/declaration/metavariable";
+import Type from "./ontology/type";
+import Term from "./ontology/term";
+import Rule from "./ontology/rule";
+import Step from "./ontology/step";
+import Label from "./ontology/label";
+import Axiom from "./ontology/axiom";
+import Lemma from "./ontology/lemma";
+import Frame from "./ontology/frame";
+import Proof from "./ontology/proof";
+import Error from "./ontology/error";
+import Premise from "./ontology/premise";
+import Theorem from "./ontology/theorem";
+import Section from "./ontology/section";
+import Equality from "./ontology/equality";
+import MetaType from "./ontology/metaType";
+import Subproof from "./ontology/subproof";
+import Variable from "./ontology/variable";
+import Property from "./ontology/property";
+import Parameter from "./ontology/parameter";
+import Reference from "./ontology/reference";
+import Statement from "./ontology/statement";
+import Judgement from "./ontology/judgement";
+import MetaLemma from "./ontology/metaLemma";
+import Deduction from "./ontology/deduction";
+import Signature from "./ontology/signature";
+import TypePrefix from "./ontology/typePrefix";
+import Conjecture from "./ontology/conjecture";
+import Conclusion from "./ontology/conclusion";
+import Derivation from "./ontology/derivation";
+import Combinator from "./ontology/combinator";
+import Hypothesis from "./ontology/hypothesis";
+import Constructor from "./ontology/constructor";
+import Declaration from "./ontology/declaration";
+import Supposition from "./ontology/supposition";
+import Metatheorem from "./ontology/metatheorem";
+import Metavariable from "./ontology/metavariable";
+import ProcedureCall from "./ontology/procedureCall";
+import SubDerivation from "./ontology/subDerivation";
+import TypeAssertion from "./ontology/assertion/type";
+import DefinedAssertion from "./ontology/assertion/defined";
+import PropertyRelation from "./ontology/propertyRelation";
+import TermSubstitution from "./ontology/substitution/term";
+import FrameSubstitution from "./ontology/substitution/frame";
+import SubproofAssertion from "./ontology/assertion/subproof";
+import PropertyAssertion from "./ontology/assertion/property";
+import ContainedAssertion from "./ontology/assertion/contained";
+import SatisfiesAssertion from "./ontology/assertion/satisfies";
+import ProcedureReference from "./ontology/procedureReference";
+import VariableDeclaration from "./ontology/declaration/variable";
+import BracketedCombinator from "./ontology/combinator/bracketed";
+import BracketedConstructor from "./ontology/constructor/bracketed";
+import SimpleTypeDeclaration from "./ontology/declaration/simpleType";
+import StatementSubstitution from "./ontology/substitution/statement";
+import ReferenceSubstitution from "./ontology/substitution/reference";
+import CombinatorDeclaration from "./ontology/declaration/combinator";
+import TypePrefixDeclaration from "./ontology/declaration/typePrefix";
+import ConstructorDeclaration from "./ontology/declaration/constructor";
+import ComplexTypeDeclaration from "./ontology/declaration/complexType";
+import MetavariableDeclaration from "./ontology/declaration/metavariable";

package/src/unifier/intrinsicLevel.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 import Unifier from "../unifier";
 
 import { nodeQuery } from "../utilities/query";
@@ -26,7 +26,7 @@ class IntrinsicLevelUnifier extends Unifier {
       unify: (generalTermVariableNode, specificTermNode, substitutions, generalContext, specificContext) => {
         let termUnifies;
 
-        const { Term, Variable } = dom,
+        const { Term, Variable } = ontology,
               termNode = specificTermNode, ///
               variableNode = generalTermVariableNode; ///
 

package/src/unifier/metaLevel.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 import Unifier from "../unifier";
 
 import { nodeQuery } from "../utilities/query";
@@ -32,7 +32,7 @@ class MetaLevelUnifier extends Unifier {
       unify: (generalStatementMetavariableNode, specificStatementNode, substitutions, generalContext, specificContext) => {
         let statementUnifies;
 
-        const { Metavariable, Statement } = dom; ///
+        const { Metavariable, Statement } = ontology; ///
 
         let context,
             statementNode;
@@ -46,7 +46,7 @@ class MetaLevelUnifier extends Unifier {
 
         statementNode = metavariableNodeParentNode; ///
 
-        const { TermSubstitution, FrameSubstitution } = dom,
+        const { TermSubstitution, FrameSubstitution } = ontology,
               frameSubstitution = FrameSubstitution.fromStatementNode(statementNode, context),
               termSubstitution = TermSubstitution.fromStatementNode(statementNode, context),
               substitution = (frameSubstitution || termSubstitution);
@@ -68,7 +68,7 @@ class MetaLevelUnifier extends Unifier {
       unify: (generalFrameDeclarationMetavariableNode, specificFrameNode, substitutions, generalContext, specificContext) => {
         let frameUnifies;
 
-        const { Frame, Metavariable } = dom,
+        const { Frame, Metavariable } = ontology,
               frameNode = specificFrameNode, ///
               metavariableNode = generalFrameDeclarationMetavariableNode;  ///
 
@@ -93,7 +93,7 @@ class MetaLevelUnifier extends Unifier {
       unify: (generalTermVariableNode, specificTermNode, substitutions, generalContext, specificContext) => {
         let termUnifies;
 
-        const { Term, Variable } = dom,
+        const { Term, Variable } = ontology,
               termNode = specificTermNode, ///
               variableNode = generalTermVariableNode; ///
 
@@ -118,7 +118,7 @@ class MetaLevelUnifier extends Unifier {
       unify: (generalDeclarationMetavariableNode, specificDeclarationMetavariableNode, substitutions, generalContext, specificContext) => {
         let referenceUnifies;
 
-        const { Metavariable, Reference } = dom;
+        const { Metavariable, Reference } = ontology;
 
         let context,
             metavariableNode;

package/src/unifier/metavariable.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 import Unifier from "../unifier";
 
 import { nodeQuery } from "../utilities/query";
@@ -28,7 +28,7 @@ class MetavariableUnifier extends Unifier {
       unify: (generalTypeNode, specificTermNode, generalContext, specificContext) => {
         let termUnifies;
 
-        const { Term } = dom,
+        const { Term } = ontology,
               typeNode = generalTypeNode, ///
               termNode = specificTermNode, ///
               nominalTypeName = typeNode.getNominalTypeName(),

package/src/unifier/statementWithCombinator.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 import Unifier from "../unifier";
 
 import { nodeQuery } from "../utilities/query";
@@ -31,7 +31,7 @@ class StatementWithCombinatorUnifier extends Unifier {
       unify: (generalMetaTypeNode, specificStatementNode, assignments, stated, generalContext, specificContext) => {
         let unifies;
 
-        const { Statement, MetaType } = dom,
+        const { Statement, MetaType } = ontology,
               metaTypeNode = generalMetaTypeNode, ///
               statementNode = specificStatementNode; ///
 
@@ -57,7 +57,7 @@ class StatementWithCombinatorUnifier extends Unifier {
       unify: (generalMetaTypeNode, specificFrameNode, assignments, stated, generalContext, specificContext) => {
         let unifies;
 
-        const { Frame, MetaType } = dom,
+        const { Frame, MetaType } = ontology,
               metaTypeNode = generalMetaTypeNode, ///
               frameNode = specificFrameNode; ///
 
@@ -83,7 +83,7 @@ class StatementWithCombinatorUnifier extends Unifier {
       unify: (generalTypeNode, specificTermNode, assignments, stated, generalContext, specificContext) => {
         let unifies = false;
 
-        const { Term } = dom,
+        const { Term } = ontology,
               typeNode = generalTypeNode, ///
               termNode = specificTermNode, ///
               nominalTypeName = typeNode.getNominalTypeName();

package/src/unifier/termWithConstructor.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 import Unifier from "../unifier";
 
 import { nodeQuery } from "../utilities/query";
@@ -28,7 +28,7 @@ class TermWithConstructorUnifier extends Unifier {
       unify: (generalTypeNode, specificTermNode, context) => {
         let unifies = false;
 
-        const { Term } = dom,
+        const { Term } = ontology,
               typeNode = generalTypeNode, ///
               nominalTypeName = typeNode.getNominalTypeName(),
               type = context.findTypeByNominalTypeName(nominalTypeName);

package/src/utilities/brackets.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 import LocalContext from "../context/local";
 import combinatorBracketedContext from "../context/bracketed/combinator";
 import constructorBracketedContext from "../context/bracketed/constructor";
@@ -12,7 +12,7 @@ export function stripBracketsFromTerm(term, context) {
         bracketedTermChildNode = bracketedTermChildNodeFromTermNode(termNode);
 
   if (bracketedTermChildNode !== null) {
-    const { Term } = dom,
+    const { Term } = ontology,
           termNode = bracketedTermChildNode;  ///
 
     term = Term.fromTermNode(termNode, context);
@@ -28,7 +28,7 @@ export function stripBracketsFromReference(reference, context) {
   if (bracketedReferenceChildNode !== null) {
     context = contextFromReference(reference, context); ///
 
-    const { Reference } = dom,
+    const { Reference } = ontology,
           referenceNode = bracketedReferenceChildNode;  ///
 
     reference = Reference.fromReferenceNode(referenceNode, context);
@@ -44,7 +44,7 @@ export function stripBracketsFromStatement(statement, context) {
   if (bracketedStatementChildNode !== null) {
     context = contextFromStatement(statement, context); ///
 
-    const { Statement } = dom,
+    const { Statement } = ontology,
           statementNode = bracketedStatementChildNode;  ///
 
     statement = Statement.fromStatementNode(statementNode, context);

package/src/utilities/context.js

@@ -1,12 +1,12 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 import LocalContext from "../context/local";
 
 export function metavariableFromFrame(frame, context) {
   context = contextFromFrame(frame, context); ///
 
-  const { Metavariable } = dom,
+  const { Metavariable } = ontology,
         frameNode = frame.getNode(),
         metavariable = Metavariable.fromFrameNode(frameNode, context);
 
@@ -16,7 +16,7 @@ export function metavariableFromFrame(frame, context) {
 export function equalityFromStatement(statement, context) {
   context = contextFromStatement(statement, context); ///
 
-  const { Equality } = dom,
+  const { Equality } = ontology,
         statementNode = statement.getNode(),
         equality = Equality.fromStatementNode(statementNode, context);
 
@@ -26,7 +26,7 @@ export function equalityFromStatement(statement, context) {
 export function judgementFromStatement(statement, context) {
   context = contextFromStatement(statement, context); ///
 
-  const { Judgement } = dom,
+  const { Judgement } = ontology,
         statementNode = statement.getNode(),
         judgement = Judgement.fromStatementNode(statementNode, context);
 
@@ -36,7 +36,7 @@ export function judgementFromStatement(statement, context) {
 export function metavariableFromStatement(statement, context) {
   context = contextFromStatement(statement, context); ///
 
-  const { Metavariable } = dom,
+  const { Metavariable } = ontology,
         statementNode = statement.getNode(),
         metavariable = Metavariable.fromStatementNode(statementNode, context);
 
@@ -46,7 +46,7 @@ export function metavariableFromStatement(statement, context) {
 export function typeAssertionFromStatement(statement, context) {
   context = contextFromStatement(statement, context); ///
 
-  const { TypeAssertion } = dom,
+  const { TypeAssertion } = ontology,
         statementNode = statement.getNode(),
         typeAssertion = TypeAssertion.fromStatementNode(statementNode, context);
 
@@ -56,7 +56,7 @@ export function typeAssertionFromStatement(statement, context) {
 export function definedAssertionFromStatement(statement, context) {
   context = contextFromStatement(statement, context); ///
 
-  const { DefinedAssertion } = dom,
+  const { DefinedAssertion } = ontology,
         statementNode = statement.getNode(),
         definedAssertion = DefinedAssertion.fromStatementNode(statementNode, context);
 
@@ -66,7 +66,7 @@ export function definedAssertionFromStatement(statement, context) {
 export function propertyAssertionFromStatement(statement, context) {
   context = contextFromStatement(statement, context); ///
 
-  const { PropertyAssertion } = dom,
+  const { PropertyAssertion } = ontology,
         statementNode = statement.getNode(),
         propertyAssertion = PropertyAssertion.fromStatementNode(statementNode, context);
 
@@ -76,7 +76,7 @@ export function propertyAssertionFromStatement(statement, context) {
 export function subproofAssertionFromStatement(statement, context) {
   context = contextFromStatement(statement, context); ///
 
-  const { SubproofAssertion } = dom,
+  const { SubproofAssertion } = ontology,
         statementNode = statement.getNode(),
         subproofAssertion = SubproofAssertion.fromStatementNode(statementNode, context);
 
@@ -86,7 +86,7 @@ export function subproofAssertionFromStatement(statement, context) {
 export function containedAssertionFromStatement(statement, context) {
   context = contextFromStatement(statement, context); ///
 
-  const { ContainedAssertion } = dom,
+  const { ContainedAssertion } = ontology,
         statementNode = statement.getNode(),
         containedAssertion = ContainedAssertion.fromStatementNode(statementNode, context);
 
@@ -96,7 +96,7 @@ export function containedAssertionFromStatement(statement, context) {
 export function satisfiesAssertionFromStatement(statement, context) {
   context = contextFromStatement(statement, context); ///
 
-  const { SatisfiesAssertion } = dom,
+  const { SatisfiesAssertion } = ontology,
         statementNode = statement.getNode(),
         satisfiesAssertion = SatisfiesAssertion.fromStatementNode(statementNode, context);
 

package/src/utilities/fileSystem.js

@@ -3,7 +3,7 @@
 import { fileSystemUtilities as occamFileSystemUtilities } from "occam-file-system";
 import { pathUtilities, fileSystemUtilities as necessaryFileSystemUtilities } from "necessary";
 
-import { releaseContextFromJSON } from "../utilities/releaseContext";
+import { releaseContextFromJSON, releaseContextFromProject } from "../utilities/releaseContext";
 
 const { loadProject } = occamFileSystemUtilities,
       { concatenatePaths } = pathUtilities,