occam-verify-cli 0.0.374 → 0.0.375

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

@@ -3,6 +3,7 @@
 export const TERM_RULE_NAME = "term";
 export const TYPE_RULE_NAME = "type";
 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,