occam-verify-cli 0.0.374 → 0.0.375

package/lib/type.js

@@ -135,17 +135,28 @@ var Type = /*#__PURE__*/ function() {
         {
             key: "toJSON",
             value: function toJSON() {
-                var superTypeJSON = this.superType === null ? null : this.superType.toJSON(), kind = _kinds.TYPE_KIND, name = this.name, superType = superTypeJSON, json = [
-                    {
-                        kind: kind,
-                        name: name,
-                        superType: superType
-                    }
-                ];
+                var superTypeJSON = this.superType === null ? null : this.superType.toJSON(), kind = _kinds.TYPE_KIND, name = this.name, superType = superTypeJSON, json = {
+                    kind: kind,
+                    name: name,
+                    superType: superType
+                };
                 return json;
             }
         }
     ], [
+        {
+            key: "fromJSON",
+            value: function fromJSON(json) {
+                var name = json.name;
+                var superType = json.superType;
+                if (superType !== null) {
+                    json = superType; ///
+                    superType = Type.fromJSON(json);
+                }
+                var type = new Type(name, superType);
+                return type;
+            }
+        },
         {
             key: "fromTypeName",
             value: function fromTypeName(typeName) {
@@ -164,4 +175,4 @@ var Type = /*#__PURE__*/ function() {
     return Type;
 }();
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/type.js","<<jsx-config-pragma.js>>"],"sourcesContent":["\"use strict\";\n\nimport { TYPE_KIND } from \"./kinds\";\n\nexport default class Type {\n  constructor(name, superType) {\n    this.name = name;\n    this.superType = superType;\n  }\n\n  getName() {\n    return this.name;\n  }\n\n  getSuperType() {\n    return this.superType;\n  }\n\n  isEqualTo(type) {\n    const equalToType = (this === type);\n\n    return equalToType;\n  }\n\n  isSubTypeOf(type) {\n    let subTypeOfType = false;\n\n    if (this.superType === type) {\n      subTypeOfType = true;\n    } else {\n      if (this.superType !== null) {\n        subTypeOfType = this.superType.isSubTypeOf(type);\n      }\n    }\n\n    return subTypeOfType;\n  }\n\n  isSuperTypeOf(type) {\n    let superTypeOfType = false;\n\n    const superType = type.getSuperType();\n\n    if (superType === this) {\n      superTypeOfType = true;\n    } else {\n      if (superType !== null) {\n        superTypeOfType = superType.isSuperTypeOf(this);\n      }\n    }\n\n    return superTypeOfType;\n  }\n\n  isEqualToOrSubTypeOf(type) {\n    const equalToType = this.isEqualTo(type),\n          subTypeOfType = this.isSubTypeOf(type),\n          equalToTypeOrSubTypeOf = (equalToType || subTypeOfType);\n\n    return equalToTypeOrSubTypeOf;\n  }\n\n  isEqualToOrSuperTypeOf(type) {\n    const equalToType = this.isEqualTo(type),\n          superTypeOfType = this.isSuperTypeOf(type),\n          equalToTypeOrSuperTypeOf = (equalToType || superTypeOfType);\n\n    return equalToTypeOrSuperTypeOf;\n  }\n\n  isEqualToSubTypeOfOrSuperTypeOf(type) {\n    const equalToType = this.isEqualTo(type),\n          subTypeOfType = this.isSubTypeOf(type),\n          superTypeOfType = this.isSuperTypeOf(type),\n          equalToTypeSubTypeOfOrSuperTypeOf = (equalToType || subTypeOfType || superTypeOfType);\n\n    return equalToTypeSubTypeOfOrSuperTypeOf;\n  }\n\n  matchName(name) {\n    const matchesName = (this.name === name);\n\n    return matchesName;\n  }\n\n  matchTypeName(typeName) {\n    const matchesTypeName = (this.name === typeName);\n\n    return matchesTypeName;\n  }\n\n  asString(noSuperType = (this.superType === null)) {\n    let string;\n\n    if (noSuperType) {\n      string = `${this.name}`;\n    } else {\n      const superTypeName = this.superType.getName();\n\n      string = `${this.name}:${superTypeName}`;\n    }\n\n    return string;\n  }\n\n  toJSON() {\n    const superTypeJSON = (this.superType === null) ?\n                            null :\n                              this.superType.toJSON(),\n          kind = TYPE_KIND,\n          name = this.name,\n          superType = superTypeJSON,  ///\n          json = [{\n            kind,\n            name,\n            superType\n          }];\n\n    return json;\n  }\n\n  static fromTypeName(typeName) {\n    const name = typeName,  ///\n          superType = null,\n          type = new Type(name, superType);\n\n    return type;\n  }\n\n  static fromTypeNameAndSuperType(typeName, superType) {\n    const name = typeName,  ///\n          type = new Type(name, superType);\n\n    return type;\n  }\n}\n","React.createElement"],"names":["Type","name","superType","getName","getSuperType","isEqualTo","type","equalToType","isSubTypeOf","subTypeOfType","isSuperTypeOf","superTypeOfType","isEqualToOrSubTypeOf","equalToTypeOrSubTypeOf","isEqualToOrSuperTypeOf","equalToTypeOrSuperTypeOf","isEqualToSubTypeOfOrSuperTypeOf","equalToTypeSubTypeOfOrSuperTypeOf","matchName","matchesName","matchTypeName","typeName","matchesTypeName","asString","noSuperType","string","superTypeName","toJSON","superTypeJSON","kind","TYPE_KIND","json","fromTypeName","fromTypeNameAndSuperType"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/type.js","<<jsx-config-pragma.js>>"],"sourcesContent":["\"use strict\";\n\nimport { TYPE_KIND } from \"./kinds\";\n\nexport default class Type {\n  constructor(name, superType) {\n    this.name = name;\n    this.superType = superType;\n  }\n\n  getName() {\n    return this.name;\n  }\n\n  getSuperType() {\n    return this.superType;\n  }\n\n  isEqualTo(type) {\n    const equalToType = (this === type);\n\n    return equalToType;\n  }\n\n  isSubTypeOf(type) {\n    let subTypeOfType = false;\n\n    if (this.superType === type) {\n      subTypeOfType = true;\n    } else {\n      if (this.superType !== null) {\n        subTypeOfType = this.superType.isSubTypeOf(type);\n      }\n    }\n\n    return subTypeOfType;\n  }\n\n  isSuperTypeOf(type) {\n    let superTypeOfType = false;\n\n    const superType = type.getSuperType();\n\n    if (superType === this) {\n      superTypeOfType = true;\n    } else {\n      if (superType !== null) {\n        superTypeOfType = superType.isSuperTypeOf(this);\n      }\n    }\n\n    return superTypeOfType;\n  }\n\n  isEqualToOrSubTypeOf(type) {\n    const equalToType = this.isEqualTo(type),\n          subTypeOfType = this.isSubTypeOf(type),\n          equalToTypeOrSubTypeOf = (equalToType || subTypeOfType);\n\n    return equalToTypeOrSubTypeOf;\n  }\n\n  isEqualToOrSuperTypeOf(type) {\n    const equalToType = this.isEqualTo(type),\n          superTypeOfType = this.isSuperTypeOf(type),\n          equalToTypeOrSuperTypeOf = (equalToType || superTypeOfType);\n\n    return equalToTypeOrSuperTypeOf;\n  }\n\n  isEqualToSubTypeOfOrSuperTypeOf(type) {\n    const equalToType = this.isEqualTo(type),\n          subTypeOfType = this.isSubTypeOf(type),\n          superTypeOfType = this.isSuperTypeOf(type),\n          equalToTypeSubTypeOfOrSuperTypeOf = (equalToType || subTypeOfType || superTypeOfType);\n\n    return equalToTypeSubTypeOfOrSuperTypeOf;\n  }\n\n  matchName(name) {\n    const matchesName = (this.name === name);\n\n    return matchesName;\n  }\n\n  matchTypeName(typeName) {\n    const matchesTypeName = (this.name === typeName);\n\n    return matchesTypeName;\n  }\n\n  asString(noSuperType = (this.superType === null)) {\n    let string;\n\n    if (noSuperType) {\n      string = `${this.name}`;\n    } else {\n      const superTypeName = this.superType.getName();\n\n      string = `${this.name}:${superTypeName}`;\n    }\n\n    return string;\n  }\n\n  toJSON() {\n    const superTypeJSON = (this.superType === null) ?\n                            null :\n                              this.superType.toJSON(),\n          kind = TYPE_KIND,\n          name = this.name,\n          superType = superTypeJSON,  ///\n          json = {\n            kind,\n            name,\n            superType\n          };\n\n    return json;\n  }\n\n  static fromJSON(json) {\n    const { name } = json;\n\n    let { superType } = json;\n\n    if (superType !== null) {\n      json = superType; ///\n\n      superType = Type.fromJSON(json);\n    }\n\n    const type = new Type(name, superType);\n\n    return type;\n  }\n\n\n  static fromTypeName(typeName) {\n    const name = typeName,  ///\n          superType = null,\n          type = new Type(name, superType);\n\n    return type;\n  }\n\n  static fromTypeNameAndSuperType(typeName, superType) {\n    const name = typeName,  ///\n          type = new Type(name, superType);\n\n    return type;\n  }\n}\n","React.createElement"],"names":["Type","name","superType","getName","getSuperType","isEqualTo","type","equalToType","isSubTypeOf","subTypeOfType","isSuperTypeOf","superTypeOfType","isEqualToOrSubTypeOf","equalToTypeOrSubTypeOf","isEqualToOrSuperTypeOf","equalToTypeOrSuperTypeOf","isEqualToSubTypeOfOrSuperTypeOf","equalToTypeSubTypeOfOrSuperTypeOf","matchName","matchesName","matchTypeName","typeName","matchesTypeName","asString","noSuperType","string","superTypeName","toJSON","superTypeJSON","kind","TYPE_KIND","json","fromJSON","fromTypeName","fromTypeNameAndSuperType"],"mappings":"AAAA;;;;;;;eAIqBA;;;qBAFK;;;;;;;;;;;;;;;;;;;;AAEX,IAAA,AAAMA,qBAAN;aAAMA,KACPC,IAAI,EAAEC,SAAS;8BADRF;QAEjB,IAAI,CAACC,IAAI,GAAGA;QACZ,IAAI,CAACC,SAAS,GAAGA;;iBAHAF;;YAMnBG,KAAAA;mBAAAA,SAAAA,UAAU;gBACR,OAAO,IAAI,CAACF,IAAI;YAClB;;;YAEAG,KAAAA;mBAAAA,SAAAA,eAAe;gBACb,OAAO,IAAI,CAACF,SAAS;YACvB;;;YAEAG,KAAAA;mBAAAA,SAAAA,UAAUC,IAAI,EAAE;gBACd,IAAMC,cAAe,IAAI,KAAKD;gBAE9B,OAAOC;YACT;;;YAEAC,KAAAA;mBAAAA,SAAAA,YAAYF,IAAI,EAAE;gBAChB,IAAIG,gBAAgB,KAAK;gBAEzB,IAAI,IAAI,CAACP,SAAS,KAAKI,MAAM;oBAC3BG,gBAAgB,IAAI;gBACtB,OAAO;oBACL,IAAI,IAAI,CAACP,SAAS,KAAK,IAAI,EAAE;wBAC3BO,gBAAgB,IAAI,CAACP,SAAS,CAACM,WAAW,CAACF;oBAC7C,CAAC;gBACH,CAAC;gBAED,OAAOG;YACT;;;YAEAC,KAAAA;mBAAAA,SAAAA,cAAcJ,IAAI,EAAE;gBAClB,IAAIK,kBAAkB,KAAK;gBAE3B,IAAMT,YAAYI,KAAKF,YAAY;gBAEnC,IAAIF,cAAc,IAAI,EAAE;oBACtBS,kBAAkB,IAAI;gBACxB,OAAO;oBACL,IAAIT,cAAc,IAAI,EAAE;wBACtBS,kBAAkBT,UAAUQ,aAAa,CAAC,IAAI;oBAChD,CAAC;gBACH,CAAC;gBAED,OAAOC;YACT;;;YAEAC,KAAAA;mBAAAA,SAAAA,qBAAqBN,IAAI,EAAE;gBACzB,IAAMC,cAAc,IAAI,CAACF,SAAS,CAACC,OAC7BG,gBAAgB,IAAI,CAACD,WAAW,CAACF,OACjCO,yBAA0BN,eAAeE;gBAE/C,OAAOI;YACT;;;YAEAC,KAAAA;mBAAAA,SAAAA,uBAAuBR,IAAI,EAAE;gBAC3B,IAAMC,cAAc,IAAI,CAACF,SAAS,CAACC,OAC7BK,kBAAkB,IAAI,CAACD,aAAa,CAACJ,OACrCS,2BAA4BR,eAAeI;gBAEjD,OAAOI;YACT;;;YAEAC,KAAAA;mBAAAA,SAAAA,gCAAgCV,IAAI,EAAE;gBACpC,IAAMC,cAAc,IAAI,CAACF,SAAS,CAACC,OAC7BG,gBAAgB,IAAI,CAACD,WAAW,CAACF,OACjCK,kBAAkB,IAAI,CAACD,aAAa,CAACJ,OACrCW,oCAAqCV,eAAeE,iBAAiBE;gBAE3E,OAAOM;YACT;;;YAEAC,KAAAA;mBAAAA,SAAAA,UAAUjB,IAAI,EAAE;gBACd,IAAMkB,cAAe,IAAI,CAAClB,IAAI,KAAKA;gBAEnC,OAAOkB;YACT;;;YAEAC,KAAAA;mBAAAA,SAAAA,cAAcC,QAAQ,EAAE;gBACtB,IAAMC,kBAAmB,IAAI,CAACrB,IAAI,KAAKoB;gBAEvC,OAAOC;YACT;;;YAEAC,KAAAA;mBAAAA,SAAAA,WAAkD;oBAAzCC,cAAAA,iEAAe,IAAI,CAACtB,SAAS,KAAK,IAAI,AAAC;gBAC9C,IAAIuB;gBAEJ,IAAID,aAAa;oBACfC,SAAS,AAAC,GAAY,OAAV,IAAI,CAACxB,IAAI;gBACvB,OAAO;oBACL,IAAMyB,gBAAgB,IAAI,CAACxB,SAAS,CAACC,OAAO;oBAE5CsB,SAAS,AAAC,GAAeC,OAAb,IAAI,CAACzB,IAAI,EAAC,KAAiB,OAAdyB;gBAC3B,CAAC;gBAED,OAAOD;YACT;;;YAEAE,KAAAA;mBAAAA,SAAAA,SAAS;gBACP,IAAMC,gBAAgB,AAAC,IAAI,CAAC1B,SAAS,KAAK,IAAI,GACtB,IAAI,GACF,IAAI,CAACA,SAAS,CAACyB,MAAM,EAAE,EAC3CE,OAAOC,gBAAS,EAChB7B,OAAO,IAAI,CAACA,IAAI,EAChBC,YAAY0B,eACZG,OAAO;oBACLF,MAAAA;oBACA5B,MAAAA;oBACAC,WAAAA;gBACF;gBAEN,OAAO6B;YACT;;;;YAEOC,KAAAA;mBAAP,SAAOA,SAASD,IAAI,EAAE;gBACpB,IAAM,AAAE9B,OAAS8B,KAAT9B;gBAER,IAAI,AAAEC,YAAc6B,KAAd7B;gBAEN,IAAIA,cAAc,IAAI,EAAE;oBACtB6B,OAAO7B,WAAW,GAAG;oBAErBA,YAAYF,AA7HGA,KA6HEgC,QAAQ,CAACD;gBAC5B,CAAC;gBAED,IAAMzB,OAAO,IAhIIN,KAgIKC,MAAMC;gBAE5B,OAAOI;YACT;;;YAGO2B,KAAAA;mBAAP,SAAOA,aAAaZ,QAAQ,EAAE;gBAC5B,IAAMpB,OAAOoB,UACPnB,YAAY,IAAI,EAChBI,OAAO,IAzIIN,KAyIKC,MAAMC;gBAE5B,OAAOI;YACT;;;YAEO4B,KAAAA;mBAAP,SAAOA,yBAAyBb,QAAQ,EAAEnB,SAAS,EAAE;gBACnD,IAAMD,OAAOoB,UACPf,OAAO,IAhJIN,KAgJKC,MAAMC;gBAE5B,OAAOI;YACT;;;WAnJmBN"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "0.0.374",
+  "version": "0.0.375",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",

package/src/axiom.js

@@ -1,7 +1,10 @@
 "use strict";
 
+import Label from "./label";
+
 import { AXIOM_KIND } from "./kinds";
 import { nodeAsString } from "./utilities/string";
+import { STATEMENT_RULE_NAME } from "occam-custom-grammars/lib/ruleNames";
 
 export default class Axiom {
   constructor(labels, statementNode, suppositionStatementNode, consequentStatementNode) {
@@ -41,28 +44,74 @@ export default class Axiom {
   }
 
   toJSON() {
-    const statementString = nodeAsString(this.statementNode),
+    const labelsJSON = this.labels.map((label) => {
+            const labelJSON = label.toJSON();
+
+            return labelJSON;
+          }),
+          statementString = nodeAsString(this.statementNode),
           consequentStatementString = nodeAsString(this.consequentStatementNode),
           suppositionStatementString = nodeAsString(this.suppositionStatementNode),
           kind = AXIOM_KIND,
+          labels = labelsJSON,  ///
           statement = statementString,  ///
           consequent = consequentStatementString, ///
           supposition = suppositionStatementString, ///
-          json = this.labels.map((label) => {
-            const labelString = label.asString();
+          json = {
+            kind,
+            labels,
+            statement,
+            consequent,
+            supposition
+          };
 
-            label = labelString;  ///
+    return json;
+  }
 
-            return ({
-              kind,
-              label,
-              statement,
-              consequent,
-              supposition
-            });
-          });
+  static fromJSON(json, callback) {
+    let { labels } = json;
 
-    return json;
+    const { statement, consequent, supposition } = json;
+
+    labels = labels.map((label) => {
+      const json = label; ///
+
+      label = Label.fromJSON(json);
+
+      return label;
+    });
+
+    let statementNode = null,
+        consequentNode = null,
+        suppositionNode = null;
+
+    if (statement !== null) {
+      const content = statement,  ///
+            ruleName = STATEMENT_RULE_NAME,
+            node = callback(content, ruleName);
+
+      statementNode = node; ///
+    }
+
+    if (consequent !== null) {
+      const content = consequent,  ///
+            ruleName = STATEMENT_RULE_NAME,
+            node = callback(content, ruleName);
+
+      consequentNode = node; ///
+    }
+
+    if (supposition !== null) {
+      const content = supposition,  ///
+            ruleName = STATEMENT_RULE_NAME,
+            node = callback(content, ruleName);
+
+      suppositionNode = node; ///
+    }
+
+    const axiom = new Axiom(labels, statementNode, consequentNode, suppositionNode);
+
+    return axiom;
   }
 
   static fromStatementNodeAndLabels(statementNode, labels) {

package/src/combinator.js

@@ -2,6 +2,7 @@
 
 import { nodeAsString } from "./utilities/string";
 import { COMBINATOR_KIND } from "./kinds";
+import { STATEMENT_RULE_NAME } from "./ruleNames";
 
 export default class Combinator {
   constructor(statementNode) {
@@ -22,14 +23,25 @@ export default class Combinator {
     const statementString = nodeAsString(this.statementNode),
           kind = COMBINATOR_KIND,
           statement = statementString,  ///
-          json = [{
+          json = {
             kind,
             statement
-          }];
+          };
 
     return json;
   }
 
+  static fromJSON(json, callback) {
+    const { statement } = json,
+          content = statement,  ///
+          ruleName = STATEMENT_RULE_NAME,
+          node = callback(content, ruleName),
+          statementNode = node, ///
+          combinator = new Combinator(statementNode);
+
+    return combinator;
+  }
+
   static fromStatementNode(statementNode) {
     const combinator = new Combinator(statementNode);
 

package/src/conclusion.js

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

package/src/constructor.js

@@ -1,6 +1,9 @@
 "use strict";
 
+import Type from "./type";
+
 import { nodeAsString } from "./utilities/string";
+import { TERM_RULE_NAME } from "./ruleNames";
 import { CONSTRUCTOR_KIND } from "./kinds";
 
 export default class Constructor {
@@ -42,15 +45,33 @@ export default class Constructor {
           kind = CONSTRUCTOR_KIND,
           term = termString,  ///
           type = typeJSON,  ///
-          json = [{
+          json = {
             kind,
             term,
             type
-          }];
+          };
 
     return json;
   }
 
+  static fromJSON(json, callback) {
+    let { type } = json;
+
+    const { term } = json,
+          content = term,  ///
+          ruleName = TERM_RULE_NAME,
+          node = callback(content, ruleName),
+          termNode = node; ///
+
+    json = type;  ///
+
+    type = Type.fromJSON(json);
+
+    const constructor = new Constructor(termNode, type);
+
+    return constructor;
+  }
+
   static fromTermNodeAndType(termNode, type) {
     const constructor = new Constructor(termNode, type);
 

package/src/context/file.js

@@ -301,31 +301,31 @@ export default class FileContext {
     this.rules.forEach((rule) => {
       const ruleJSON = rule.toJSON();
 
-      push(json, ruleJSON);
+      json.push(ruleJSON);
     });
 
     this.types.forEach((type) => {
       const typeJSON = type.toJSON();
 
-      push(json, typeJSON);
+      json.push(typeJSON);
     });
 
     this.axioms.forEach((axiom) => {
       const axiomJSON = axiom.toJSON();
 
-      push(json, axiomJSON);
+      json.push(axiomJSON);
     });
 
     this.combinators.forEach((combinator) => {
       const combinatorJSON = combinator.toJSON();
 
-      push(json, combinatorJSON);
+      json.push(combinatorJSON);
     });
 
     this.constructors.forEach((constructor) => {
       const constructorJSON = constructor.toJSON();
 
-      push(json, constructorJSON)
+      json.push(constructorJSON)
     });
 
     return json;

package/src/context/release/directory.js

@@ -16,8 +16,8 @@ export default class DirectoryReleaseContext extends ReleaseContext {
     return this.fileContexts;
   }
 
-  getRules(releaseNames = []) {
-    const rules = [],
+  getTypes(releaseNames = []) {
+    const types = [],
           releaseName = this.getReleaseName(),
           releaseNamesIncludesReleaseName = releaseNames.includes(releaseName);
 
@@ -27,23 +27,23 @@ export default class DirectoryReleaseContext extends ReleaseContext {
       const bubble = false;
 
       this.fileContexts.forEach((fileContext) => {
-        const fileContextRules = fileContext.getRules(bubble);
+        const fileContextTypes = fileContext.getTypes(bubble);
 
-        push(rules, fileContextRules);
+        push(types, fileContextTypes);
       });
 
       this.releaseContexts.forEach((releaseContext) => {
-        const releaseContextRules = releaseContext.getRules(releaseNames);
+        const releaseContextTypes = releaseContext.getTypes(releaseNames);
 
-        push(rules, releaseContextRules);
+        push(types, releaseContextTypes);
       });
     }
 
-    return rules;
+    return types;
   }
 
-  getTypes(releaseNames = []) {
-    const types = [],
+  getRules(releaseNames = []) {
+    const rules = [],
           releaseName = this.getReleaseName(),
           releaseNamesIncludesReleaseName = releaseNames.includes(releaseName);
 
@@ -53,19 +53,19 @@ export default class DirectoryReleaseContext extends ReleaseContext {
       const bubble = false;
 
       this.fileContexts.forEach((fileContext) => {
-        const fileContextTypes = fileContext.getTypes(bubble);
+        const fileContextRules = fileContext.getRules(bubble);
 
-        push(types, fileContextTypes);
+        push(rules, fileContextRules);
       });
 
       this.releaseContexts.forEach((releaseContext) => {
-        const releaseContextTypes = releaseContext.getTypes(releaseNames);
+        const releaseContextRules = releaseContext.getRules(releaseNames);
 
-        push(types, releaseContextTypes);
+        push(rules, releaseContextRules);
       });
     }
 
-    return types;
+    return rules;
   }
 
   getAxioms(releaseNames = []) {

package/src/context/release/file.js

@@ -2,17 +2,23 @@
 
 import ReleaseContext from "../../context/release";
 
+import Rule from "../../rule";
+import Type from "../../type";
+import Axiom from "../../axiom";
+import Combinator from "../../combinator";
+import Constructor from "../../constructor";
+
 import { push } from "../../utilities/array";
-import {combinedCustomGrammarFromReleaseContexts, customGrammarFromNameAndEntries} from "../../utilities/customGrammar";
+import { customGrammarFromNameAndEntries } from "../../utilities/customGrammar";
+import { RULE_KIND, TYPE_KIND, AXIOM_KIND, COMBINATOR_KIND, CONSTRUCTOR_KIND } from "../../kinds";
 
 export default class FileReleaseContext extends ReleaseContext {
-  constructor(log, name, entries, callbacks, verified, customGrammar, florenceLexer, florenceParser, releaseContexts, contextJSON, rules, types, axioms, labels, combinators, constructors) {
+  constructor(log, name, entries, callbacks, verified, customGrammar, florenceLexer, florenceParser, releaseContexts, contextJSON, types, rules, axioms, combinators, constructors) {
     super(log, name, entries, callbacks, verified, customGrammar, florenceLexer, florenceParser, releaseContexts);
 
-    this.rules = rules;
     this.types = types;
+    this.rules = rules;
     this.axioms = axioms;
-    this.labels = labels;
     this.combinators = combinators;
     this.constructors = constructors;
     this.contextJSON = contextJSON;
@@ -22,10 +28,10 @@ export default class FileReleaseContext extends ReleaseContext {
     return this.contextJSON;
   }
 
-  getRules(releaseNames = []) {
-    const rules = [
-            ...this.rules
-          ],
+  getTypes(releaseNames = []) {
+    const types = [
+          ...this.types
+        ],
           releaseName = this.getReleaseName(),
           releaseNamesIncludesReleaseName = releaseNames.includes(releaseName);
 
@@ -33,18 +39,18 @@ export default class FileReleaseContext extends ReleaseContext {
       releaseNames.push(releaseName);
 
       this.releaseContexts.forEach((releaseContext) => {
-        const releaseContextRules = releaseContext.getRules(releaseNames);
+        const releaseContextTypes = releaseContext.getTypes(releaseNames);
 
-        push(rules, releaseContextRules);
+        push(types, releaseContextTypes);
       });
     }
 
-    return rules;
+    return types;
   }
 
-  getTypes(releaseNames = []) {
-    const types = [
-            ...this.types
+  getRules(releaseNames = []) {
+    const rules = [
+            ...this.rules
           ],
           releaseName = this.getReleaseName(),
           releaseNamesIncludesReleaseName = releaseNames.includes(releaseName);
@@ -53,13 +59,13 @@ export default class FileReleaseContext extends ReleaseContext {
       releaseNames.push(releaseName);
 
       this.releaseContexts.forEach((releaseContext) => {
-        const releaseContextTypes = releaseContext.getTypes(releaseNames);
+        const releaseContextRules = releaseContext.getRules(releaseNames);
 
-        push(types, releaseContextTypes);
+        push(rules, releaseContextRules);
       });
     }
 
-    return types;
+    return rules;
   }
 
   getAxioms(releaseNames = []) {
@@ -83,19 +89,29 @@ export default class FileReleaseContext extends ReleaseContext {
   }
 
   getLabels(releaseNames = []) {
-    const labels = [
-            ...this.labels
-          ],
+    const labels = [],
           releaseName = this.getReleaseName(),
           releaseNamesIncludesReleaseName = releaseNames.includes(releaseName);
 
+    this.rules.forEach((rule) => {
+      const ruleLabels = rule.getLabels();
+
+      push(labels, ruleLabels);
+    });
+
+    this.axioms.forEach((axiom) => {
+      const axiomLabels = axiom.getLabels();
+
+      push(labels, axiomLabels);
+    });
+
     if (!releaseNamesIncludesReleaseName) {
       releaseNames.push(releaseName);
 
       this.releaseContexts.forEach((releaseContext) => {
-        const releaseContextLabels = releaseContext.getLabels(releaseNames);
+        const releaseContextAxioms = releaseContext.getAxioms(releaseNames);
 
-        push(labels, releaseContextLabels);
+        push(labels, releaseContextAxioms);
       });
     }
 
@@ -145,7 +161,61 @@ export default class FileReleaseContext extends ReleaseContext {
   initialise(dependencyReleaseContexts) {
     super.initialise(dependencyReleaseContexts);
 
-    debugger
+    const ruleMap = this.florenceParser.getRuleMap(),
+          jsonArray = this.contextJSON,  ///
+          callback = (content, ruleName) => {
+            const tokens = this.florenceLexer.tokenise(content),
+                  rule = ruleMap[ruleName],
+                  node = this.florenceParser.parse(tokens, rule);
+
+            return node;
+          };
+
+    jsonArray.forEach((json) => {
+      const { kind } = json;
+
+      switch (kind) {
+        case TYPE_KIND: {
+          const type = Type.fromJSON(json);
+
+          this.types.push(type);
+
+          break;
+        }
+
+        case RULE_KIND: {
+          const rule = Rule.fromJSON(json, callback);
+
+          this.rules.push(rule);
+
+          break;
+        }
+
+        case AXIOM_KIND: {
+          const axiom = Axiom.fromJSON(json, callback);
+
+          this.axioms.push(axiom);
+
+          break;
+        }
+
+        case COMBINATOR_KIND: {
+          const combinator = Combinator.fromJSON(json, callback);
+
+          this.combinators.push(combinator);
+
+          break;
+        }
+
+        case CONSTRUCTOR_KIND: {
+          const constructor = Constructor.fromJSON(json, callback);
+
+          this.constructors.push(constructor);
+
+          break;
+        }
+      }
+    });
   }
 
   static fromLogNameEntriesCallbacksAndContextJSON(log, name, entries, callbacks, contextJSON) {
@@ -154,13 +224,12 @@ export default class FileReleaseContext extends ReleaseContext {
           florenceLexer = null,
           florenceParser = null,
           releaseContexts = null,
-          rules = null,
           types = null,
+          rules = null,
           axioms = null,
-          labels = null,
           combinators = null,
           constructors = null,
-          releaseContext = new FileReleaseContext(log, name, entries, callbacks, verified, customGrammar, florenceLexer, florenceParser, releaseContexts, contextJSON, rules, types, axioms, labels, combinators, constructors);
+          releaseContext = new FileReleaseContext(log, name, entries, callbacks, verified, customGrammar, florenceLexer, florenceParser, releaseContexts, contextJSON, types, rules, axioms, combinators, constructors);
 
     return releaseContext;
   }

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 { TERM_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 = TERM_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);