occam-verify-cli 1.0.382 → 1.0.385

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,

package/src/utilities/json.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 
 export function termFromJSON(json, context) {
   let { term } = json;
@@ -9,7 +9,7 @@ export function termFromJSON(json, context) {
 
   json = termJSON;  ///
 
-  const { Term } = dom;
+  const { Term } = ontology;
 
   term = Term.fromJSON(json, context);
 
@@ -52,7 +52,7 @@ export function statementFromJSON(json, context) {
   let { statement = null } = json;
 
   if (statement !== null) {
-    const { Statement } = dom,
+    const { Statement } = ontology,
           statementJSON = statement;  ///
 
     json = statementJSON; ///
@@ -66,7 +66,7 @@ export function statementFromJSON(json, context) {
 export function deductionFromJSON(json, context) {
   let { deduction } = json;
 
-  const { Deduction } = dom,
+  const { Deduction } = ontology,
         deductionJSON = deduction;  ///
 
   json = deductionJSON;  ///
@@ -80,7 +80,7 @@ export function signatureFromJSON(json, context) {
   let { signature = null } = json;
 
   if (signature !== null) {
-    const { Signature } = dom,
+    const { Signature } = ontology,
           signatureJSON = signature;  ///
 
     json = signatureJSON; ///
@@ -94,7 +94,7 @@ export function signatureFromJSON(json, context) {
 export function conclusionFromJSON(json, context) {
   let { conclusion } = json;
 
-  const { Conclusion } = dom,
+  const { Conclusion } = ontology,
         conclusionJSON = conclusion;  ///
 
   json = conclusionJSON;  ///
@@ -107,7 +107,7 @@ export function conclusionFromJSON(json, context) {
 export function metavariableFromJSON(json, context) {
   let { metavariable } = json;
 
-  const { Metavariable } = dom,
+  const { Metavariable } = ontology,
         metavariableJSON = metavariable;  ///
 
   json = metavariableJSON; ///
@@ -121,7 +121,7 @@ export function procedureCallFromJSON(json, context) {
   let { procedureCall = null } = json;
 
   if (procedureCall !== null) {
-    const { ProcedureCall } = dom,
+    const { ProcedureCall } = ontology,
           procedureCallJSON = procedureCall;  ///
 
     json = procedureCallJSON; ///
@@ -135,7 +135,7 @@ export function procedureCallFromJSON(json, context) {
 export function procedureReferenceFromJSON(json, context) {
   let { procedureReference } = json;
 
-  const { ProcedureReference } = dom,
+  const { ProcedureReference } = ontology,
         procedureReferenceJSON = procedureReference;  ///
 
   json = procedureReferenceJSON;  ///
@@ -148,7 +148,7 @@ export function procedureReferenceFromJSON(json, context) {
 export function typesFromJSON(json, types, context) {
   const { types: typesJSON } = json;
 
-  const { Type } = dom;
+  const { Type } = ontology;
 
   typesJSON.forEach((typeJSON) => {
     const json = typeJSON,  ///
@@ -161,7 +161,7 @@ export function typesFromJSON(json, types, context) {
 export function termsFromJSON(json, context) {
   let { terms } = json;
 
-  const { Term } = dom,
+  const { Term } = ontology,
         termsJSON = terms; ///
 
   terms = termsJSON.map((termJSON) => {
@@ -177,7 +177,7 @@ export function termsFromJSON(json, context) {
 export function rulesFromJSON(json, context) {
   let { rules } = json;
 
-  const { Rule } = dom,
+  const { Rule } = ontology,
         rulesJSON = rules; ///
 
   rules = rulesJSON.map((ruleJSON) => {
@@ -193,7 +193,7 @@ export function rulesFromJSON(json, context) {
 export function labelFromJSON(json, context) {
   let { label } = json;
 
-  const { Label } = dom,
+  const { Label } = ontology,
         labelJSON = label;  ///
 
   json = labelJSON; ///
@@ -206,7 +206,7 @@ export function labelFromJSON(json, context) {
 export function labelsFromJSON(json, context) {
   let { labels } = json;
 
-  const { Label } = dom,
+  const { Label } = ontology,
         labelsJSON = labels;  ///
 
   labels = labelsJSON.map((labelJSON) => {
@@ -222,7 +222,7 @@ export function labelsFromJSON(json, context) {
 export function axiomsFromJSON(json, context) {
   let { axioms } = json;
 
-  const { Axiom } = dom,
+  const { Axiom } = ontology,
         axiomsJSON = axioms; ///
 
   axioms = axiomsJSON.map((axiomJSON) => {
@@ -238,7 +238,7 @@ export function axiomsFromJSON(json, context) {
 export function premisesFromJSON(json, context) {
   let { premises } = json;
 
-  const { Premise } = dom,
+  const { Premise } = ontology,
         premisesJSON = premises;  ///
 
   premises = premisesJSON.map((premiseJSON) => {
@@ -254,7 +254,7 @@ export function premisesFromJSON(json, context) {
 export function theoremsFromJSON(json, context) {
   let { theorems } = json;
 
-  const { Theorem } = dom,
+  const { Theorem } = ontology,
         theoremsJSON = theorems; ///
 
   theorems = theoremsJSON.map((theoremJSON) => {
@@ -270,7 +270,7 @@ export function theoremsFromJSON(json, context) {
 export function variablesFromJSON(json, context) {
   let { variables } = json;
 
-  const { Variable } = dom,
+  const { Variable } = ontology,
         variablesJSON = variables; ///
 
   variables = variablesJSON.map((variableJSON) => {
@@ -286,7 +286,7 @@ export function variablesFromJSON(json, context) {
 export function propertiesFromJSON(json, context) {
   let { properties } = json;
 
-  const { Property } = dom,
+  const { Property } = ontology,
         propertiesJSON = properties; ///
 
   properties = propertiesJSON.map((propertyJSON) => {
@@ -319,7 +319,7 @@ export function superTypesFromJSON(json, context) {
 export function hypothesesFromJSON(json, context) {
   let { hypotheses } = json;
 
-  const { Hypothesis } = dom,
+  const { Hypothesis } = ontology,
         hypothesesJSON = hypotheses;  ///
 
   hypotheses = hypothesesJSON.map((hypothesisJSON) => {
@@ -335,7 +335,7 @@ export function hypothesesFromJSON(json, context) {
 export function parametersFromJSON(json, context) {
   let { parameters } = json;
 
-  const { Parameter } = dom,
+  const { Parameter } = ontology,
         parametersJSON = parameters; ///
 
   parameters = parametersJSON.map((parameterJSON) => {
@@ -351,7 +351,7 @@ export function parametersFromJSON(json, context) {
 export function conjecturesFromJSON(json, context) {
   let { conjectures } = json;
 
-  const { Conjecture } = dom,
+  const { Conjecture } = ontology,
         conjecturesJSON = conjectures; ///
 
   conjectures = conjecturesJSON.map((conjectureJSON) => {
@@ -367,7 +367,7 @@ export function conjecturesFromJSON(json, context) {
 export function combinatorsFromJSON(json, context) {
   let { combinators } = json;
 
-  const { Combinator } = dom,
+  const { Combinator } = ontology,
         combinatorsJSON = combinators; ///
 
   combinators = combinatorsJSON.map((combinatorJSON) => {
@@ -383,7 +383,7 @@ export function combinatorsFromJSON(json, context) {
 export function typePrefixesFromJSON(json, context) {
   let { typePrefixes } = json;
 
-  const { TypePrefix } = dom,
+  const { TypePrefix } = ontology,
         typePrefixesJSON = typePrefixes; ///
 
   typePrefixes = typePrefixesJSON.map((typePrefixJSON) => {
@@ -399,7 +399,7 @@ export function typePrefixesFromJSON(json, context) {
 export function constructorsFromJSON(json, context) {
   let { constructors } = json;
 
-  const { Constructor } = dom,
+  const { Constructor } = ontology,
         constructorsJSON = constructors; ///
 
   constructors = constructorsJSON.map((constructorJSON) => {
@@ -415,7 +415,7 @@ export function constructorsFromJSON(json, context) {
 export function metatheoremsFromJSON(json, context) {
   let { metatheorems } = json;
 
-  const { Metatheorem } = dom,
+  const { Metatheorem } = ontology,
         metatheoremsJSON = metatheorems; ///
 
   metatheorems = metatheoremsJSON.map((metatheoremJSON) => {
@@ -431,7 +431,7 @@ export function metatheoremsFromJSON(json, context) {
 export function suppositionsFromJSON(json, context) {
   let { suppositions } = json;
 
-  const { Supposition } = dom,
+  const { Supposition } = ontology,
         suppositionsJSON = suppositions;  ///
 
   suppositions = suppositionsJSON.map((suppositionJSON) => {
@@ -447,7 +447,7 @@ export function suppositionsFromJSON(json, context) {
 export function substitutionsFromJSON(json, context) {
   let { substitutions = [] } = json;  ///
 
-  const { StatementSubstitution } = dom,
+  const { StatementSubstitution } = ontology,
         substitutionsJSON = substitutions,  ///
         Substitution = StatementSubstitution; ///
 
@@ -464,7 +464,7 @@ export function substitutionsFromJSON(json, context) {
 export function metavariablesFromJSON(json, context) {
   let { metavariables } = json;
 
-  const { Metavariable } = dom,
+  const { Metavariable } = ontology,
         metavariablesJSON = metavariables; ///
 
   metavariables = metavariablesJSON.map((metavariableJSON) => {

package/src/utilities/node.js

@@ -1,8 +1,8 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 
-import { baseType } from "../dom/type";
+import { baseType } from "../ontology/type";
 
 export function typeFromTypeNode(typeNode, context) {
   let type;
@@ -10,7 +10,7 @@ export function typeFromTypeNode(typeNode, context) {
   if (typeNode === null) {
     type = baseType;
   } else {
-    const { Type } = dom,
+    const { Type } = ontology,
           typeName = typeNode.getTypeName(),
           typePrefixName = typeNode.getTypePrefixName(),
           nominalTypeName = typeNode.getNominalTypeName(),
@@ -28,7 +28,7 @@ export function typeFromTypeNode(typeNode, context) {
 }
 
 export function termFromTermNode(termNode, context) {
-  const { Term } = dom,
+  const { Term } = ontology,
         node = termNode,  ///
         string = context.nodeAsString(node),
         type = null,
@@ -38,7 +38,7 @@ export function termFromTermNode(termNode, context) {
 }
 
 export function statementFromStatementNode(statementNode, context) {
-  const { Statement } = dom,
+  const { Statement } = ontology,
         node = statementNode, ///
         tokens = context.nodeAsTokens(node),
         string = context.tokensAsString(tokens),
@@ -64,7 +64,7 @@ export function variableFromTerm(term, context) {
         singularVariableNode = termNode.getSingularVariableNode();
 
   if (singularVariableNode !== null) {
-    const { Variable } = dom,
+    const { Variable } = ontology,
           variableNode = singularVariableNode;  ///
 
     variable = Variable.fromVariableNode(variableNode, context);

package/src/utilities/release.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function verifyRelease(releaseName, dependentName, dependentReleased, releaseContextMap) {
+export function verifyRelease(releaseName, dependentName, dependentReleased, releaseContextMap) {
   let releaseVerifies = false;
 
   const releaseContext = releaseContextMap[releaseName];

package/src/utilities/releaseContext.js

@@ -57,7 +57,7 @@ export function createReleaseContext(dependency, dependentNames, context, callba
 
     if (!releaseContextCreated) {
       const error = null,
-        success = false;
+            success = false;
 
       callback(error, success);
 
@@ -68,7 +68,7 @@ export function createReleaseContext(dependency, dependentNames, context, callba
 
     if (!releaseMatchesDependency) {
       const error = null,
-        success = false;
+            success = false;
 
       callback(error, success);
 
@@ -137,7 +137,7 @@ export function initialiseReleaseContext(dependency, context) {
       initialiseDependencyReleaseContexts(dependency, releaseContext, context);
 
       const { log } = context,
-        releaseContexts = retrieveReleaseContexts(releaseContext, releaseContextMap);
+            releaseContexts = retrieveReleaseContexts(releaseContext, releaseContextMap);
 
       log.info(`Initialising the '${dependencyName}' context...`);
 

package/src/utilities/substitutions.js

@@ -1,10 +1,10 @@
 "use strict";
 
-import dom from "../dom";
+import ontology from "../ontology";
 
 export function termFromTermAndSubstitutions(term, substitutions, context) {
   if (term !== null) {
-    const { Variable } = dom,
+    const { Variable } = ontology,
           termNode = term.getNode(),
           variable = Variable.fromTermNode(termNode, context);
 
@@ -24,7 +24,7 @@ export function termFromTermAndSubstitutions(term, substitutions, context) {
 
 export function frameFromFrameAndSubstitutions(frame, substitutions, context) {
   if (frame !== null) {
-    const { Metavariable } = dom,
+    const { Metavariable } = ontology,
           frameNode = frame.getNode(),
           metavariable = Metavariable.fromFrameNode(frameNode, context);
 
@@ -46,7 +46,7 @@ export function frameFromFrameAndSubstitutions(frame, substitutions, context) {
 
 export function statementFromStatementAndSubstitutions(statement, substitutions, context) {
   if (statement !== null) {
-    const { Metavariable } = dom,
+    const { Metavariable } = ontology,
           statementNode = statement.getNode(),
           metavariable = Metavariable.fromStatementNode(statementNode, context);
 
@@ -55,7 +55,7 @@ export function statementFromStatementAndSubstitutions(statement, substitutions,
     if (metavariable !== null) {
       let substitution;
 
-      const { TermSubstitution, FrameSubstitution } = dom,
+      const { TermSubstitution, FrameSubstitution } = ontology,
             termSubstitution = TermSubstitution.fromStatementNode(statementNode, context),
             frameSubstitution = FrameSubstitution.fromStatementNode(statementNode, context);
 

package/src/utilities/type.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { baseType } from "../dom/type";
+import { baseType } from "../ontology/type";
 
 export function stringFromTypeNameTypePrefixNameAndSuperTypes(typeName, typePrefixName, superTypes) {
   let string;