occam-verify-cli 0.0.374 → 0.0.376

package/src/context/release.js

@@ -8,7 +8,7 @@ const { florenceLexerFromCombinedCustomGrammar } = lexersUtilities,
       { florenceParserFromCombinedCustomGrammar } = parsersUtilities;
 
 export default class ReleaseContext {
-  constructor(log, name, entries, callbacks, verified, customGrammar, florenceLexer, florenceParser, releaseContexts) {
+  constructor(log, name, entries, callbacks, verified, customGrammar, florenceLexer, florenceParser, dependencyReleaseContexts) {
     this.log = log;
     this.name = name;
     this.entries = entries;
@@ -17,7 +17,7 @@ export default class ReleaseContext {
     this.customGrammar = customGrammar;
     this.florenceLexer = florenceLexer;
     this.florenceParser = florenceParser;
-    this.releaseContexts = releaseContexts;
+    this.dependencyReleaseContexts = dependencyReleaseContexts;
   }
 
   getLog() {
@@ -52,8 +52,8 @@ export default class ReleaseContext {
     return this.florenceParser;
   }
 
-  getReleaseContexts() {
-    return this.releaseContexts;
+  getDependencyReleaseContexts() {
+    return this.dependencyReleaseContexts;
   }
 
   getReleaseName() {
@@ -64,7 +64,7 @@ export default class ReleaseContext {
   }
 
   isInitialised() {
-    const initialised = (this.releaseContexts !== null);  ///
+    const initialised = (this.dependencyReleaseContexts !== null);  ///
 
     return initialised;
   }
@@ -117,6 +117,6 @@ export default class ReleaseContext {
 
     this.florenceParser = florenceParserFromCombinedCustomGrammar(combinedCustomGrammar);
 
-    this.releaseContexts = releaseContexts;
+    this.dependencyReleaseContexts = dependencyReleaseContexts;
   }
 }

package/src/kinds.js

@@ -1,7 +1,7 @@
 "use strict";
 
-export const RULE_KIND = "rule";
 export const TYPE_KIND = "type";
+export const RULE_KIND = "rule";
 export const AXIOM_KIND = "axiom";
 export const COMBINATOR_KIND = "combinator";
 export const CONSTRUCTOR_KIND = "constructor";

package/src/label.js

@@ -1,6 +1,7 @@
 "use strict";
 
 import { nodeAsString } from "./utilities/string";
+import { LABEL_RULE_NAME } from "./ruleNames";
 import { labelNameFromLabelNode } from "./utilities/query";
 
 export default class Label {
@@ -26,6 +27,22 @@ export default class Label {
     return string;
   }
 
+  toJSON() {
+    const string = nodeAsString(this.node),
+          json = string;  ///
+
+    return json;
+  }
+
+  static fromJSON(json, callback) {
+    const content = json, ///
+          ruleName = LABEL_RULE_NAME,
+          node = callback(content, ruleName),
+          label = new Label(node);
+
+    return label;
+  }
+
   static fromLabelNode(labelNode) {
     const node = labelNode, ///
           variable = new Label(node);

package/src/premise.js

@@ -70,6 +70,17 @@ export default class Premise {
     return json;
   }
 
+  static fromJSON(json, callback) {
+    const { metastatement } = json,
+          ruleName = METASTATEMENT_RULE_NAME,
+          content = metastatement,  ///
+          node = callback(content, ruleName),
+          metastatementNode = node, ///
+          premise = new Premise(metastatementNode);
+
+    return premise;
+  }
+
   static fromMetastatementNode(metastatementNode) {
     const premise = new Premise(metastatementNode);
 

package/src/rule.js

@@ -1,5 +1,9 @@
 "use strict";
 
+import Label from "./label";
+import Premise from "./premise";
+import Conclusion from "./conclusion";
+
 import { prune } from "./utilities/array";
 import { RULE_KIND } from "./kinds";
 import { someSubArray } from "./utilities/array";
@@ -62,29 +66,57 @@ export default class Rule {
   }
 
   toJSON() {
-    const premisesJSON = this.premises.map((premise) => {
+    const labelsJSON = this.labels.map((label) => {
+            const labelJSON = label.toJSON();
+
+            return labelJSON;
+          }),
+          premisesJSON = this.premises.map((premise) => {
             const premiseJSON = premise.toJSON();
 
             return premiseJSON;
           }),
           conclusionJSON = this.conclusion.toJSON(),
           kind = RULE_KIND,
+          labels = labelsJSON,  ///
           premises = premisesJSON,  ///
           conclusion = conclusionJSON,  ///
-          json = this.labels.map((label) => {
-            const labelString = label.asString();
+          json = {
+            kind,
+            labels,
+            premises,
+            conclusion
+          };
+
+    return json;
+  }
 
-            label = labelString;  ///
+  static fromJSON(json, callback) {
+    let { labels, premises, conclusion } = json;
 
-            return ({
-              kind,
-              label,
-              premises,
-              conclusion
-            });
-          });
+    labels = labels.map((label) => {
+      const json = label; ///
 
-    return json;
+      label = Label.fromJSON(json, callback);
+
+      return label;
+    });
+
+    premises = premises.map((premise) => {
+      const json = premise; ///
+
+      premise = Premise.fromJSON(json, callback);
+
+      return premise;
+    });
+
+    json = conclusion;  ///
+
+    conclusion = Conclusion.fromJSON(json, callback);
+
+    const rule = new Rule(labels, premises, conclusion);
+
+    return rule;
   }
 
   static fromLabelsPremisesAndConclusion(labels, premises, conclusion) {

package/src/ruleNames.js

@@ -2,7 +2,9 @@
 
 export const TERM_RULE_NAME = "term";
 export const TYPE_RULE_NAME = "type";
+export const LABEL_RULE_NAME = "label";
 export const ARGUMENT_RULE_NAME = "argument";
+export const STATEMENT_RULE_NAME = "statement";
 export const METAVARIABLE_RULE_NAME = "metavariable";
 export const METASTATEMENT_RULE_NAME = "metastatement";
 export const META_SUBPROOF_RULE_NAME = "metaSubproof";

package/src/type.js

@@ -110,15 +110,32 @@ export default class Type {
           kind = TYPE_KIND,
           name = this.name,
           superType = superTypeJSON,  ///
-          json = [{
+          json = {
             kind,
             name,
             superType
-          }];
+          };
 
     return json;
   }
 
+  static fromJSON(json) {
+    const { name } = json;
+
+    let { superType } = json;
+
+    if (superType !== null) {
+      json = superType; ///
+
+      superType = Type.fromJSON(json);
+    }
+
+    const type = new Type(name, superType);
+
+    return type;
+  }
+
+
   static fromTypeName(typeName) {
     const name = typeName,  ///
           superType = null,

package/src/verify/release.js

@@ -17,17 +17,15 @@ export default function verifyRelease(releaseName, releaseContextMap) {
       const releaseFilesVerified = verifyReleaseFiles(releaseContext);
 
       if (releaseFilesVerified) {
-        releaseVerified = true;
-      }
-    }
-  }
+        const verified = true;
 
-  if (releaseVerified) {
-    const verified = true;
+        releaseVerified = true;
 
-    releaseContext.setVerified(verified);
+        releaseContext.setVerified(verified);
 
-    releaseContext.info(`Verified the '${releaseName}' package.`);
+        releaseContext.info(`Verified the '${releaseName}' package.`);
+      }
+    }
   }
 
   return releaseVerified;