occam-verify-cli 0.0.543 → 0.0.545

package/src/context/release.js

@@ -286,11 +286,10 @@ export default class ReleaseContext {
     return type;
   }
 
-  getReleaseName() {
-    const name = this.getName(),
-          releaseName = name; ///
+  isReleased() {
+    const released = (this.json !== null);
 
-    return releaseName;
+    return released;
   }
 
   isInitialised() {
@@ -299,6 +298,13 @@ export default class ReleaseContext {
     return initialised;
   }
 
+  getReleaseName() {
+    const name = this.getName(),
+          releaseName = name; ///
+
+    return releaseName;
+  }
+
   getFile(filePath) { return this.entries.getFile(filePath); }
 
   getVersion() { return this.entries.getVersion(); }
@@ -330,8 +336,7 @@ export default class ReleaseContext {
   fatal(message, node = null, tokens = null, filePath = null) { this.log.fatal(message, node, tokens, filePath); }
 
   initialise(dependencyReleaseContexts) {
-    const fileContexts = [],
-          releaseContext = this,  ///
+    const releaseContext = this,  ///
           releaseContexts = [
             releaseContext,
             ...dependencyReleaseContexts
@@ -340,26 +345,30 @@ export default class ReleaseContext {
           florenceLexer = florenceLexerFromCombinedCustomGrammar(combinedCustomGrammar),
           florenceParser = florenceParserFromCombinedCustomGrammar(combinedCustomGrammar);
 
-    if (this.json !== null) {
+    this.lexer = florenceLexer; ///
+
+    this.parser = florenceParser; ///
+
+    if (this.json === null) {
+      this.verified = false;
+
+      this.fileContexts = [];
+    } else {
       const fileContextsJSON = this.json; ///
 
-      fileContextsJSON.forEach((fileContextJSON) => {
+      this.verified = true;
+
+      this.fileContexts = fileContextsJSON.map((fileContextJSON) => {
         const json = fileContextJSON, ///
               { filePath } = json,
               fileContext = FileContext.fromFilePathAndReleaseContext(filePath, releaseContext);
 
         fileContext.initialise(json);
 
-        fileContexts.push(fileContext);
+        return fileContext;
       });
     }
 
-    this.lexer = florenceLexer; ///
-
-    this.parser = florenceParser; ///
-
-    this.fileContexts = fileContexts;
-
     this.dependencyReleaseContexts = dependencyReleaseContexts;
   }
 
@@ -377,7 +386,7 @@ export default class ReleaseContext {
   static fromLogJSONNameAndEntries(log, json, name, entries) {
     const lexer = null,
           parser = null,
-          verified = false,
+          verified = null,
           customGrammar = customGrammarFromNameAndEntries(name, entries),
           fileContexts = null,
           dependencyReleaseContexts = null,

package/src/lemma.js

@@ -2,11 +2,7 @@
 
 import AxiomLemmaTheoremConjecture from "./axiomLemmaTheoremConjecture";
 
-import { LEMMA_KIND } from "./kinds";
-
 export default class Lemma extends AxiomLemmaTheoremConjecture {
-  static kind = LEMMA_KIND;
-
   static fromJSONAndFileContext(json, fileContext) { return AxiomLemmaTheoremConjecture.fromJSONAndFileContext(Lemma,json, fileContext); }
 
   static fromLabelsSuppositionsConsequenceAndProofContext(labels, suppositions, consequence, proofContext) { return AxiomLemmaTheoremConjecture.fromLabelsSuppositionsConsequenceAndProofContext(Lemma, labels, suppositions, consequence, proofContext); }

package/src/metaType.js

@@ -1,6 +1,5 @@
 "use strict";
 
-import { META_TYPE_KIND } from "./kinds";
 import { STATEMENT_META_TYPE_NAME } from "./metaTypeNames";
 
 export default class MetaType {
@@ -44,10 +43,8 @@ export default class MetaType {
   }
 
   toJSON(tokens) {
-    const kind = META_TYPE_KIND,
-          name = this.name,
+    const name = this.name,
           json = {
-            kind,
             name
           };
 

package/src/metavariable.js

@@ -2,8 +2,6 @@
 
 import MetaType from "./metaType";
 
-import { METAVARIABLE_KIND } from "./kinds";
-
 export default class Metavariable {
   constructor(name, metaType) {
     this.name = name;
@@ -26,11 +24,9 @@ export default class Metavariable {
 
   toJSON(tokens) {
     const metaTypeJSON = this.metaType.toJSON(tokens),
-          kind = METAVARIABLE_KIND,
           name = this.name, ///
           metaType = metaTypeJSON,  ///
           json = {
-            kind,
             name,
             metaType
           };
@@ -62,7 +58,7 @@ export default class Metavariable {
 
     const metaTypeName = metaType.getName();
 
-    metaType = fileContext.findTypeByTypeName(metaTypeName); ///
+    metaType = fileContext.findMetaTypeByMetaTypeName(metaTypeName); ///
 
     const metavariable = new Metavariable(name, metaType);
 

package/src/rule.js

@@ -5,7 +5,6 @@ import Premise from "./premise";
 import Conclusion from "./conclusion";
 
 import { prune } from "./utilities/array";
-import { RULE_KIND } from "./kinds";
 import { someSubArray } from "./utilities/array";
 
 export default class Rule {
@@ -125,12 +124,10 @@ export default class Rule {
             return premiseJSON;
           }),
           conclusionJSON = this.conclusion.toJSON(tokens),
-          kind = RULE_KIND,
           labels = labelsJSON,  ///
           premises = premisesJSON,  ///
           conclusion = conclusionJSON,  ///
           json = {
-            kind,
             labels,
             premises,
             conclusion

package/src/theorem.js

@@ -2,11 +2,7 @@
 
 import AxiomLemmaTheoremConjecture from "./axiomLemmaTheoremConjecture";
 
-import { THEOREM_KIND } from "./kinds";
-
 export default class Theorem extends AxiomLemmaTheoremConjecture {
-  static kind = THEOREM_KIND;
-
   static fromJSONAndFileContext(json, fileContext) { return AxiomLemmaTheoremConjecture.fromJSONAndFileContext(Theorem, json, fileContext); }
 
   static fromLabelsSuppositionsConsequenceAndProofContext(labels, suppositions, consequence, proofContext) { return AxiomLemmaTheoremConjecture.fromLabelsSuppositionsConsequenceAndProofContext(Theorem, labels, suppositions, consequence, proofContext); }

package/src/type.js

@@ -1,6 +1,5 @@
 "use strict";
 
-import { TYPE_KIND } from "./kinds";
 import { OBJECT_TYPE_NAME } from "./typeNames";
 
 export default class Type {
@@ -121,11 +120,9 @@ export default class Type {
 
   toJSON(tokens) {
     const superTypeJSON = this.superType.toJSON(tokens),
-          kind = TYPE_KIND,
           name = this.name,
           superType = superTypeJSON,  ///
           json = {
-            kind,
             name,
             superType
           };
@@ -167,11 +164,9 @@ export default class Type {
 
 class ObjectType extends Type {
   toJSON(tokens) {
-    const kind = TYPE_KIND,
-          name = this.name,
+    const name = this.name,
           superType = null,  ///
           json = {
-            kind,
             name,
             superType
           };

package/src/utilities/releaseContext.js

@@ -47,12 +47,12 @@ export function createReleaseContext(dependency, dependentNames, context, callba
   }, context);
 }
 
-export function initialiseReleaseContext(dependency, dependentName, verified, context, callback) {
+export function initialiseReleaseContext(dependency, dependentName, dependentReleased, context, callback) {
   let error = null;
 
   const { releaseContextMap } = context,
-        dependencyName = dependency.getName(),
-        releaseName = dependencyName, ///
+        name = dependency.getName(),
+        releaseName = name, ///
         releaseContext = releaseContextMap[releaseName] || null;
 
   if (releaseContext === null) {
@@ -61,7 +61,8 @@ export function initialiseReleaseContext(dependency, dependentName, verified, co
     return;
   }
 
-  const initialised = releaseContext.isInitialised();
+  const released = releaseContext.isReleased(),
+        initialised = releaseContext.isInitialised();
 
   if (initialised) {
     callback(error);
@@ -69,11 +70,9 @@ export function initialiseReleaseContext(dependency, dependentName, verified, co
     return;
   }
 
-  const releaseContextVerified = releaseContext.isVerified();
-
-  if (verified) {
-    if (!releaseContextVerified) {
-      error = `Unable to initialise the '${releaseName}' dependency's context because its '${dependentName}' dependent is a package.`;
+  if (!released) {
+    if (dependentReleased) {
+      error = `Unable to initialise the '${name}' dependency's context because its '${dependentName}' dependent is a package.`;
 
       callback(error);
 
@@ -81,14 +80,14 @@ export function initialiseReleaseContext(dependency, dependentName, verified, co
     }
   }
 
-  dependentName = releaseName;  ///
+  dependentName = name;  ///
 
-  verified = releaseContextVerified;  ///
+  dependentReleased = released;  ///
 
   const dependencies = releaseContext.getDependencies();
 
   dependencies.asynchronousForEachDependency((dependency, next, done) => {
-    initialiseReleaseContext(dependency, dependentName, verified, context, (error) => {
+    initialiseReleaseContext(dependency, dependentName, dependentReleased, context, (error) => {
       if (error) {
         callback(error);
 

package/src/variable.js

@@ -2,8 +2,6 @@
 
 import Type from "./type";
 
-import { VARIABLE_KIND } from "./kinds";
-
 export default class Variable {
   constructor(name, type) {
     this.name = name;
@@ -33,11 +31,9 @@ export default class Variable {
 
   toJSON(tokens) {
     const typeJSON = this.type.toJSON(tokens),
-          kind = VARIABLE_KIND,
           name = this.name, ///
           type = typeJSON,  ///
           json = {
-            kind,
             name,
             type
           };

package/lib/kinds.js

@@ -1,58 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    TYPE_KIND: function() {
-        return TYPE_KIND;
-    },
-    RULE_KIND: function() {
-        return RULE_KIND;
-    },
-    AXIOM_KIND: function() {
-        return AXIOM_KIND;
-    },
-    LEMMA_KIND: function() {
-        return LEMMA_KIND;
-    },
-    THEOREM_KIND: function() {
-        return THEOREM_KIND;
-    },
-    VARIABLE_KIND: function() {
-        return VARIABLE_KIND;
-    },
-    META_TYPE_KIND: function() {
-        return META_TYPE_KIND;
-    },
-    CONJECTURE_KIND: function() {
-        return CONJECTURE_KIND;
-    },
-    COMBINATOR_KIND: function() {
-        return COMBINATOR_KIND;
-    },
-    CONSTRUCTOR_KIND: function() {
-        return CONSTRUCTOR_KIND;
-    },
-    METAVARIABLE_KIND: function() {
-        return METAVARIABLE_KIND;
-    }
-});
-var TYPE_KIND = "type";
-var RULE_KIND = "rule";
-var AXIOM_KIND = "axiom";
-var LEMMA_KIND = "lemma";
-var THEOREM_KIND = "theorem";
-var VARIABLE_KIND = "variable";
-var META_TYPE_KIND = "meta-type";
-var CONJECTURE_KIND = "conjecture";
-var COMBINATOR_KIND = "combinator";
-var CONSTRUCTOR_KIND = "constructor";
-var METAVARIABLE_KIND = "metavariable";
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9raW5kcy5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuZXhwb3J0IGNvbnN0IFRZUEVfS0lORCA9IFwidHlwZVwiO1xuZXhwb3J0IGNvbnN0IFJVTEVfS0lORCA9IFwicnVsZVwiO1xuZXhwb3J0IGNvbnN0IEFYSU9NX0tJTkQgPSBcImF4aW9tXCI7XG5leHBvcnQgY29uc3QgTEVNTUFfS0lORCA9IFwibGVtbWFcIjtcbmV4cG9ydCBjb25zdCBUSEVPUkVNX0tJTkQgPSBcInRoZW9yZW1cIjtcbmV4cG9ydCBjb25zdCBWQVJJQUJMRV9LSU5EID0gXCJ2YXJpYWJsZVwiO1xuZXhwb3J0IGNvbnN0IE1FVEFfVFlQRV9LSU5EID0gXCJtZXRhLXR5cGVcIjtcbmV4cG9ydCBjb25zdCBDT05KRUNUVVJFX0tJTkQgPSBcImNvbmplY3R1cmVcIjtcbmV4cG9ydCBjb25zdCBDT01CSU5BVE9SX0tJTkQgPSBcImNvbWJpbmF0b3JcIjtcbmV4cG9ydCBjb25zdCBDT05TVFJVQ1RPUl9LSU5EID0gXCJjb25zdHJ1Y3RvclwiO1xuZXhwb3J0IGNvbnN0IE1FVEFWQVJJQUJMRV9LSU5EID0gXCJtZXRhdmFyaWFibGVcIjtcbiJdLCJuYW1lcyI6WyJUWVBFX0tJTkQiLCJSVUxFX0tJTkQiLCJBWElPTV9LSU5EIiwiTEVNTUFfS0lORCIsIlRIRU9SRU1fS0lORCIsIlZBUklBQkxFX0tJTkQiLCJNRVRBX1RZUEVfS0lORCIsIkNPTkpFQ1RVUkVfS0lORCIsIkNPTUJJTkFUT1JfS0lORCIsIkNPTlNUUlVDVE9SX0tJTkQiLCJNRVRBVkFSSUFCTEVfS0lORCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O0lBRWFBLFNBQVM7ZUFBVEE7O0lBQ0FDLFNBQVM7ZUFBVEE7O0lBQ0FDLFVBQVU7ZUFBVkE7O0lBQ0FDLFVBQVU7ZUFBVkE7O0lBQ0FDLFlBQVk7ZUFBWkE7O0lBQ0FDLGFBQWE7ZUFBYkE7O0lBQ0FDLGNBQWM7ZUFBZEE7O0lBQ0FDLGVBQWU7ZUFBZkE7O0lBQ0FDLGVBQWU7ZUFBZkE7O0lBQ0FDLGdCQUFnQjtlQUFoQkE7O0lBQ0FDLGlCQUFpQjtlQUFqQkE7OztBQVZOLElBQU1WLFlBQVk7QUFDbEIsSUFBTUMsWUFBWTtBQUNsQixJQUFNQyxhQUFhO0FBQ25CLElBQU1DLGFBQWE7QUFDbkIsSUFBTUMsZUFBZTtBQUNyQixJQUFNQyxnQkFBZ0I7QUFDdEIsSUFBTUMsaUJBQWlCO0FBQ3ZCLElBQU1DLGtCQUFrQjtBQUN4QixJQUFNQyxrQkFBa0I7QUFDeEIsSUFBTUMsbUJBQW1CO0FBQ3pCLElBQU1DLG9CQUFvQiJ9

package/src/kinds.js

@@ -1,13 +0,0 @@
-"use strict";
-
-export const TYPE_KIND = "type";
-export const RULE_KIND = "rule";
-export const AXIOM_KIND = "axiom";
-export const LEMMA_KIND = "lemma";
-export const THEOREM_KIND = "theorem";
-export const VARIABLE_KIND = "variable";
-export const META_TYPE_KIND = "meta-type";
-export const CONJECTURE_KIND = "conjecture";
-export const COMBINATOR_KIND = "combinator";
-export const CONSTRUCTOR_KIND = "constructor";
-export const METAVARIABLE_KIND = "metavariable";