occam-verify-cli 0.0.543 → 0.0.545

package/lib/utilities/releaseContext.js

@@ -72,36 +72,35 @@ function createReleaseContext(dependency, dependentNames, context, callback) {
         createDependencyReleaseContexts(dependency, dependentNames, context, callback);
     }, context);
 }
-function initialiseReleaseContext(dependency, dependentName, verified, context, callback) {
+function initialiseReleaseContext(dependency, dependentName, dependentReleased, context, callback) {
     var done = function done() {
         var dependencyReleaseContexts = retrieveDependencyReleaseContexts(dependency, context);
         releaseContext.initialise(dependencyReleaseContexts);
         callback(error);
     };
     var error = null;
-    var releaseContextMap = context.releaseContextMap, dependencyName = dependency.getName(), releaseName = dependencyName, releaseContext = releaseContextMap[releaseName] || null;
+    var releaseContextMap = context.releaseContextMap, name = dependency.getName(), releaseName = name, releaseContext = releaseContextMap[releaseName] || null;
     if (releaseContext === null) {
         callback(error);
         return;
     }
-    var initialised = releaseContext.isInitialised();
+    var released = releaseContext.isReleased(), initialised = releaseContext.isInitialised();
     if (initialised) {
         callback(error);
         return;
     }
-    var releaseContextVerified = releaseContext.isVerified();
-    if (verified) {
-        if (!releaseContextVerified) {
-            error = "Unable to initialise the '".concat(releaseName, "' dependency's context because its '").concat(dependentName, "' dependent is a package.");
+    if (!released) {
+        if (dependentReleased) {
+            error = "Unable to initialise the '".concat(name, "' dependency's context because its '").concat(dependentName, "' dependent is a package.");
             callback(error);
             return;
         }
     }
-    dependentName = releaseName; ///
-    verified = releaseContextVerified; ///
+    dependentName = name; ///
+    dependentReleased = released; ///
     var dependencies = releaseContext.getDependencies();
     dependencies.asynchronousForEachDependency(function(dependency, next, done) {
-        initialiseReleaseContext(dependency, dependentName, verified, context, function(error) {
+        initialiseReleaseContext(dependency, dependentName, dependentReleased, context, function(error) {
             if (error) {
                 callback(error);
                 return;
@@ -179,4 +178,4 @@ function retrieveDependencyReleaseContexts(dependency, context) {
     return dependencyReleaseContexts;
 }
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/releaseContext.js"],"sourcesContent":["\"use strict\";\n\nimport { last } from \"../utilities/array\";\n\nexport function createReleaseContext(dependency, dependentNames, context, callback) {\n  const { releaseContextMap } = context,\n        dependencyName = dependency.getName(),\n        releaseName = dependencyName, ///\n        releaseContext = releaseContextMap[releaseName] || null;\n\n  if (releaseContext !== null) {\n    const error = checkReleaseMatchesDependency(dependency, dependentNames, releaseContext);\n\n    callback(error);\n\n    return;\n  }\n\n  const { releaseContextFromDependency } = context;\n\n  releaseContextFromDependency(dependency, context, (error, releaseContext) => {\n    if (error) {\n      callback(error);\n\n      return;\n    }\n\n    if (releaseContext === null) {\n      const error = `The '${releaseName}' package could not be created.`;\n\n      callback(error);\n\n      return;\n    }\n\n    error = checkReleaseMatchesDependency(dependency, dependentNames, releaseContext);\n\n    if (error) {\n      callback(error);\n\n      return;\n    }\n\n    releaseContextMap[releaseName] = releaseContext;\n\n    createDependencyReleaseContexts(dependency, dependentNames, context, callback);\n  }, context);\n}\n\nexport function initialiseReleaseContext(dependency, dependentName, verified, context, callback) {\n  let error = null;\n\n  const { releaseContextMap } = context,\n        dependencyName = dependency.getName(),\n        releaseName = dependencyName, ///\n        releaseContext = releaseContextMap[releaseName] || null;\n\n  if (releaseContext === null) {\n    callback(error);\n\n    return;\n  }\n\n  const initialised = releaseContext.isInitialised();\n\n  if (initialised) {\n    callback(error);\n\n    return;\n  }\n\n  const releaseContextVerified = releaseContext.isVerified();\n\n  if (verified) {\n    if (!releaseContextVerified) {\n      error = `Unable to initialise the '${releaseName}' dependency's context because its '${dependentName}' dependent is a package.`;\n\n      callback(error);\n\n      return;\n    }\n  }\n\n  dependentName = releaseName;  ///\n\n  verified = releaseContextVerified;  ///\n\n  const dependencies = releaseContext.getDependencies();\n\n  dependencies.asynchronousForEachDependency((dependency, next, done) => {\n    initialiseReleaseContext(dependency, dependentName, verified, context, (error) => {\n      if (error) {\n        callback(error);\n\n        return;\n      }\n\n      next();\n    });\n  }, done);\n\n  function done() {\n    const dependencyReleaseContexts = retrieveDependencyReleaseContexts(dependency, context);\n\n    releaseContext.initialise(dependencyReleaseContexts);\n\n    callback(error);\n  }\n}\n\nexport default {\n  createReleaseContext,\n  initialiseReleaseContext\n};\n\nfunction checkCyclicDependencyExists(dependency, dependentNames) {\n  let error = null;\n\n  const dependencyName = dependency.getName(),\n        dependentNamesIncludesDependencyName = dependentNames.includes(dependencyName),\n        cyclicDependencyExists = dependentNamesIncludesDependencyName;  ///\n\n  if (cyclicDependencyExists) {\n    const firstDependentName = first(dependentNames),\n          dependencyNames = [  ///\n            ...dependentNames,\n            firstDependentName\n          ],\n          dependencyNamesString = dependencyNames.join(`' -> '`);\n\n    error =`There is a cyclic dependency: '${dependencyNamesString}'.`;\n  }\n\n  return error;\n}\n\nfunction checkReleaseMatchesDependency(dependency, dependentNames, releaseContext) {\n  let error = null;\n\n  const entries = releaseContext.getEntries(),\n        shortenedVersion = dependency.getShortedVersion();\n\n  if (shortenedVersion !== null) {\n    const entriesMatchShortenedVersion = entries.matchShortenedVersion(shortenedVersion);\n\n    if (!entriesMatchShortenedVersion) {\n      const version = releaseContext.getVersion(),\n            versionString = version.toString(),\n            lastDependentName = last(dependentNames),\n            dependentName = lastDependentName,  ///\n            dependencyName = dependency.getName(),\n            shortenedVersion = dependency.getShortedVersion(),\n            shortenedVersionString = shortenedVersion.toString();\n\n      error = `Version mismatch: '${dependentName}' requires '${dependencyName}' to be version ${shortenedVersionString}.0 or higher but version ${versionString} has been supplied.`;\n    }\n  }\n\n  return error;\n}\n\nfunction createDependencyReleaseContexts(dependency, dependentNames, context, callback) {\n  const { releaseContextMap } = context,\n        dependencyName = dependency.getName(),\n        releaseName = dependencyName, ///\n        releaseContext = releaseContextMap[releaseName],\n        dependencies = releaseContext.getDependencies();\n\n  dependentNames = [ ...dependentNames, dependencyName ];  ///\n\n  dependencies.asynchronousForEachDependency((dependency, next, done) => {\n    const error = checkCyclicDependencyExists(dependency, dependentNames);\n\n    if (error) {\n      callback(error);\n\n      return;\n    }\n\n    createReleaseContext(dependency, dependentNames, context, (error) => {\n      if (error) {\n        callback(error);\n\n        return;\n      }\n\n      next();\n    });\n  }, done);\n\n  function done() {\n    const error = null;\n\n    callback(error);\n  }\n}\n\nfunction retrieveDependencyReleaseContexts(dependency, context, dependencyReleaseContexts = []) {\n  const { releaseContextMap } = context,\n        dependencyName = dependency.getName(),\n        releaseName = dependencyName, ///\n        releaseContext = releaseContextMap[releaseName],\n        dependencies = releaseContext.getDependencies();\n\n  dependencies.forEachDependency((dependency) => {\n    const dependencyName = dependency.getName(),\n          releaseName = dependencyName, ///\n          releaseContext = releaseContextMap[releaseName] || null;\n\n    if (releaseContext === null) {\n      return;\n    }\n\n    const dependencyReleaseContextsIncludesReleaseContext = dependencyReleaseContexts.includes(releaseContext);\n\n    if (dependencyReleaseContextsIncludesReleaseContext) {\n      return;\n    }\n\n    retrieveDependencyReleaseContexts(dependency, context, dependencyReleaseContexts);\n\n    dependencyReleaseContexts.push(releaseContext);\n  });\n\n  return dependencyReleaseContexts;\n}\n"],"names":["createReleaseContext","initialiseReleaseContext","dependency","dependentNames","context","callback","releaseContextMap","dependencyName","getName","releaseName","releaseContext","error","checkReleaseMatchesDependency","releaseContextFromDependency","createDependencyReleaseContexts","dependentName","verified","done","dependencyReleaseContexts","retrieveDependencyReleaseContexts","initialise","initialised","isInitialised","releaseContextVerified","isVerified","dependencies","getDependencies","asynchronousForEachDependency","next","checkCyclicDependencyExists","dependentNamesIncludesDependencyName","includes","cyclicDependencyExists","firstDependentName","first","dependencyNames","dependencyNamesString","join","entries","getEntries","shortenedVersion","getShortedVersion","entriesMatchShortenedVersion","matchShortenedVersion","version","getVersion","versionString","toString","lastDependentName","last","shortenedVersionString","forEachDependency","dependencyReleaseContextsIncludesReleaseContext","push"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/releaseContext.js"],"sourcesContent":["\"use strict\";\n\nimport { last } from \"../utilities/array\";\n\nexport function createReleaseContext(dependency, dependentNames, context, callback) {\n  const { releaseContextMap } = context,\n        dependencyName = dependency.getName(),\n        releaseName = dependencyName, ///\n        releaseContext = releaseContextMap[releaseName] || null;\n\n  if (releaseContext !== null) {\n    const error = checkReleaseMatchesDependency(dependency, dependentNames, releaseContext);\n\n    callback(error);\n\n    return;\n  }\n\n  const { releaseContextFromDependency } = context;\n\n  releaseContextFromDependency(dependency, context, (error, releaseContext) => {\n    if (error) {\n      callback(error);\n\n      return;\n    }\n\n    if (releaseContext === null) {\n      const error = `The '${releaseName}' package could not be created.`;\n\n      callback(error);\n\n      return;\n    }\n\n    error = checkReleaseMatchesDependency(dependency, dependentNames, releaseContext);\n\n    if (error) {\n      callback(error);\n\n      return;\n    }\n\n    releaseContextMap[releaseName] = releaseContext;\n\n    createDependencyReleaseContexts(dependency, dependentNames, context, callback);\n  }, context);\n}\n\nexport function initialiseReleaseContext(dependency, dependentName, dependentReleased, context, callback) {\n  let error = null;\n\n  const { releaseContextMap } = context,\n        name = dependency.getName(),\n        releaseName = name, ///\n        releaseContext = releaseContextMap[releaseName] || null;\n\n  if (releaseContext === null) {\n    callback(error);\n\n    return;\n  }\n\n  const released = releaseContext.isReleased(),\n        initialised = releaseContext.isInitialised();\n\n  if (initialised) {\n    callback(error);\n\n    return;\n  }\n\n  if (!released) {\n    if (dependentReleased) {\n      error = `Unable to initialise the '${name}' dependency's context because its '${dependentName}' dependent is a package.`;\n\n      callback(error);\n\n      return;\n    }\n  }\n\n  dependentName = name;  ///\n\n  dependentReleased = released;  ///\n\n  const dependencies = releaseContext.getDependencies();\n\n  dependencies.asynchronousForEachDependency((dependency, next, done) => {\n    initialiseReleaseContext(dependency, dependentName, dependentReleased, context, (error) => {\n      if (error) {\n        callback(error);\n\n        return;\n      }\n\n      next();\n    });\n  }, done);\n\n  function done() {\n    const dependencyReleaseContexts = retrieveDependencyReleaseContexts(dependency, context);\n\n    releaseContext.initialise(dependencyReleaseContexts);\n\n    callback(error);\n  }\n}\n\nexport default {\n  createReleaseContext,\n  initialiseReleaseContext\n};\n\nfunction checkCyclicDependencyExists(dependency, dependentNames) {\n  let error = null;\n\n  const dependencyName = dependency.getName(),\n        dependentNamesIncludesDependencyName = dependentNames.includes(dependencyName),\n        cyclicDependencyExists = dependentNamesIncludesDependencyName;  ///\n\n  if (cyclicDependencyExists) {\n    const firstDependentName = first(dependentNames),\n          dependencyNames = [  ///\n            ...dependentNames,\n            firstDependentName\n          ],\n          dependencyNamesString = dependencyNames.join(`' -> '`);\n\n    error =`There is a cyclic dependency: '${dependencyNamesString}'.`;\n  }\n\n  return error;\n}\n\nfunction checkReleaseMatchesDependency(dependency, dependentNames, releaseContext) {\n  let error = null;\n\n  const entries = releaseContext.getEntries(),\n        shortenedVersion = dependency.getShortedVersion();\n\n  if (shortenedVersion !== null) {\n    const entriesMatchShortenedVersion = entries.matchShortenedVersion(shortenedVersion);\n\n    if (!entriesMatchShortenedVersion) {\n      const version = releaseContext.getVersion(),\n            versionString = version.toString(),\n            lastDependentName = last(dependentNames),\n            dependentName = lastDependentName,  ///\n            dependencyName = dependency.getName(),\n            shortenedVersion = dependency.getShortedVersion(),\n            shortenedVersionString = shortenedVersion.toString();\n\n      error = `Version mismatch: '${dependentName}' requires '${dependencyName}' to be version ${shortenedVersionString}.0 or higher but version ${versionString} has been supplied.`;\n    }\n  }\n\n  return error;\n}\n\nfunction createDependencyReleaseContexts(dependency, dependentNames, context, callback) {\n  const { releaseContextMap } = context,\n        dependencyName = dependency.getName(),\n        releaseName = dependencyName, ///\n        releaseContext = releaseContextMap[releaseName],\n        dependencies = releaseContext.getDependencies();\n\n  dependentNames = [ ...dependentNames, dependencyName ];  ///\n\n  dependencies.asynchronousForEachDependency((dependency, next, done) => {\n    const error = checkCyclicDependencyExists(dependency, dependentNames);\n\n    if (error) {\n      callback(error);\n\n      return;\n    }\n\n    createReleaseContext(dependency, dependentNames, context, (error) => {\n      if (error) {\n        callback(error);\n\n        return;\n      }\n\n      next();\n    });\n  }, done);\n\n  function done() {\n    const error = null;\n\n    callback(error);\n  }\n}\n\nfunction retrieveDependencyReleaseContexts(dependency, context, dependencyReleaseContexts = []) {\n  const { releaseContextMap } = context,\n        dependencyName = dependency.getName(),\n        releaseName = dependencyName, ///\n        releaseContext = releaseContextMap[releaseName],\n        dependencies = releaseContext.getDependencies();\n\n  dependencies.forEachDependency((dependency) => {\n    const dependencyName = dependency.getName(),\n          releaseName = dependencyName, ///\n          releaseContext = releaseContextMap[releaseName] || null;\n\n    if (releaseContext === null) {\n      return;\n    }\n\n    const dependencyReleaseContextsIncludesReleaseContext = dependencyReleaseContexts.includes(releaseContext);\n\n    if (dependencyReleaseContextsIncludesReleaseContext) {\n      return;\n    }\n\n    retrieveDependencyReleaseContexts(dependency, context, dependencyReleaseContexts);\n\n    dependencyReleaseContexts.push(releaseContext);\n  });\n\n  return dependencyReleaseContexts;\n}\n"],"names":["createReleaseContext","initialiseReleaseContext","dependency","dependentNames","context","callback","releaseContextMap","dependencyName","getName","releaseName","releaseContext","error","checkReleaseMatchesDependency","releaseContextFromDependency","createDependencyReleaseContexts","dependentName","dependentReleased","done","dependencyReleaseContexts","retrieveDependencyReleaseContexts","initialise","name","released","isReleased","initialised","isInitialised","dependencies","getDependencies","asynchronousForEachDependency","next","checkCyclicDependencyExists","dependentNamesIncludesDependencyName","includes","cyclicDependencyExists","firstDependentName","first","dependencyNames","dependencyNamesString","join","entries","getEntries","shortenedVersion","getShortedVersion","entriesMatchShortenedVersion","matchShortenedVersion","version","getVersion","versionString","toString","lastDependentName","last","shortenedVersionString","forEachDependency","dependencyReleaseContextsIncludesReleaseContext","push"],"mappings":"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"}

package/lib/variable.js

@@ -9,7 +9,6 @@ Object.defineProperty(exports, "default", {
     }
 });
 var _type = /*#__PURE__*/ _interopRequireDefault(require("./type"));
-var _kinds = require("./kinds");
 function _classCallCheck(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
@@ -70,8 +69,7 @@ var Variable = /*#__PURE__*/ function() {
         {
             key: "toJSON",
             value: function toJSON(tokens) {
-                var typeJSON = this.type.toJSON(tokens), kind = _kinds.VARIABLE_KIND, name = this.name, type = typeJSON, json = {
-                    kind: kind,
+                var typeJSON = this.type.toJSON(tokens), name = this.name, type = typeJSON, json = {
                     name: name,
                     type: type
                 };
@@ -103,4 +101,4 @@ var Variable = /*#__PURE__*/ function() {
     return Variable;
 }();
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy92YXJpYWJsZS5qcyIsIjw8anN4LWNvbmZpZy1wcmFnbWEuanM+PiJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFR5cGUgZnJvbSBcIi4vdHlwZVwiO1xuXG5pbXBvcnQgeyBWQVJJQUJMRV9LSU5EIH0gZnJvbSBcIi4va2luZHNcIjtcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgVmFyaWFibGUge1xuICBjb25zdHJ1Y3RvcihuYW1lLCB0eXBlKSB7XG4gICAgdGhpcy5uYW1lID0gbmFtZTtcbiAgICB0aGlzLnR5cGUgPSB0eXBlO1xuICB9XG5cbiAgZ2V0TmFtZSgpIHtcbiAgICByZXR1cm4gdGhpcy5uYW1lO1xuICB9XG5cbiAgZ2V0VHlwZSgpIHtcbiAgICByZXR1cm4gdGhpcy50eXBlO1xuICB9XG5cbiAgbWF0Y2hOYW1lKG5hbWUpIHtcbiAgICBjb25zdCBtYXRjaGVzTmFtZSA9ICh0aGlzLm5hbWUgPT09IG5hbWUpO1xuXG4gICAgcmV0dXJuIG1hdGNoZXNOYW1lO1xuICB9XG5cbiAgYXNTdHJpbmcodG9rZW5zKSB7XG4gICAgY29uc3QgdHlwZU5hbWUgPSB0aGlzLnR5cGUuZ2V0TmFtZSgpLFxuICAgICAgICAgIHN0cmluZyA9IGAke3RoaXMubmFtZX06JHt0eXBlTmFtZX1gO1xuXG4gICAgcmV0dXJuIHN0cmluZztcbiAgfVxuXG4gIHRvSlNPTih0b2tlbnMpIHtcbiAgICBjb25zdCB0eXBlSlNPTiA9IHRoaXMudHlwZS50b0pTT04odG9rZW5zKSxcbiAgICAgICAgICBraW5kID0gVkFSSUFCTEVfS0lORCxcbiAgICAgICAgICBuYW1lID0gdGhpcy5uYW1lLCAvLy9cbiAgICAgICAgICB0eXBlID0gdHlwZUpTT04sICAvLy9cbiAgICAgICAgICBqc29uID0ge1xuICAgICAgICAgICAga2luZCxcbiAgICAgICAgICAgIG5hbWUsXG4gICAgICAgICAgICB0eXBlXG4gICAgICAgICAgfTtcblxuICAgIHJldHVybiBqc29uO1xuICB9XG5cbiAgc3RhdGljIGZyb21OYW1lQW5kVHlwZShuYW1lLCB0eXBlKSB7XG4gICAgY29uc3QgdmFyaWFibGUgPSBuZXcgVmFyaWFibGUobmFtZSwgdHlwZSk7XG5cbiAgICByZXR1cm4gdmFyaWFibGU7XG4gIH1cblxuICBzdGF0aWMgZnJvbUpTT05BbmRGaWxlQ29udGV4dChqc29uLCBmaWxlQ29udGV4dCkge1xuICAgIGNvbnN0IHsgbmFtZSB9ID0ganNvbjtcblxuICAgIGxldCB7IHR5cGUgfSA9IGpzb247XG5cbiAgICBqc29uID0gdHlwZTsgIC8vL1xuXG4gICAgdHlwZSA9IFR5cGUuZnJvbUpTT05BbmRGaWxlQ29udGV4dChqc29uLCBmaWxlQ29udGV4dCk7XG5cbiAgICBjb25zdCB0eXBlTmFtZSA9IHR5cGUuZ2V0TmFtZSgpO1xuXG4gICAgdHlwZSA9IGZpbGVDb250ZXh0LmZpbmRUeXBlQnlUeXBlTmFtZSh0eXBlTmFtZSk7IC8vL1xuXG4gICAgY29uc3QgdmFyaWFibGUgPSBuZXcgVmFyaWFibGUobmFtZSwgdHlwZSk7XG5cbiAgICByZXR1cm4gdmFyaWFibGU7XG4gIH1cbn1cbiIsIlJlYWN0LmNyZWF0ZUVsZW1lbnQiXSwibmFtZXMiOlsiVmFyaWFibGUiLCJuYW1lIiwidHlwZSIsImdldE5hbWUiLCJnZXRUeXBlIiwibWF0Y2hOYW1lIiwibWF0Y2hlc05hbWUiLCJhc1N0cmluZyIsInRva2VucyIsInR5cGVOYW1lIiwic3RyaW5nIiwidG9KU09OIiwidHlwZUpTT04iLCJraW5kIiwiVkFSSUFCTEVfS0lORCIsImpzb24iLCJmcm9tTmFtZUFuZFR5cGUiLCJ2YXJpYWJsZSIsImZyb21KU09OQW5kRmlsZUNvbnRleHQiLCJmaWxlQ29udGV4dCIsIlR5cGUiLCJmaW5kVHlwZUJ5VHlwZU5hbWUiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7O2VBTXFCQTs7O3lEQUpKO3FCQUVhOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRWYsSUFBQSxBQUFNQSx5QkFBTjthQUFNQSxTQUNQQyxJQUFJLEVBQUVDLElBQUk7OEJBREhGO1FBRWpCLElBQUksQ0FBQ0MsSUFBSSxHQUFHQTtRQUNaLElBQUksQ0FBQ0MsSUFBSSxHQUFHQTs7aUJBSEtGOztZQU1uQkcsS0FBQUE7bUJBQUFBLFNBQUFBLFVBQVU7Z0JBQ1IsT0FBTyxJQUFJLENBQUNGLElBQUk7WUFDbEI7OztZQUVBRyxLQUFBQTttQkFBQUEsU0FBQUEsVUFBVTtnQkFDUixPQUFPLElBQUksQ0FBQ0YsSUFBSTtZQUNsQjs7O1lBRUFHLEtBQUFBO21CQUFBQSxTQUFBQSxVQUFVSixJQUFJLEVBQUU7Z0JBQ2QsSUFBTUssY0FBZSxJQUFJLENBQUNMLElBQUksS0FBS0E7Z0JBRW5DLE9BQU9LO1lBQ1Q7OztZQUVBQyxLQUFBQTttQkFBQUEsU0FBQUEsU0FBU0MsTUFBTSxFQUFFO2dCQUNmLElBQU1DLFdBQVcsSUFBSSxDQUFDUCxJQUFJLENBQUNDLE9BQU8sSUFDNUJPLFNBQVMsQUFBQyxHQUFlRCxPQUFiLElBQUksQ0FBQ1IsSUFBSSxFQUFDLEtBQVksT0FBVFE7Z0JBRS9CLE9BQU9DO1lBQ1Q7OztZQUVBQyxLQUFBQTttQkFBQUEsU0FBQUEsT0FBT0gsTUFBTSxFQUFFO2dCQUNiLElBQU1JLFdBQVcsSUFBSSxDQUFDVixJQUFJLENBQUNTLE1BQU0sQ0FBQ0gsU0FDNUJLLE9BQU9DLG9CQUFhLEVBQ3BCYixPQUFPLElBQUksQ0FBQ0EsSUFBSSxFQUNoQkMsT0FBT1UsVUFDUEcsT0FBTztvQkFDTEYsTUFBQUE7b0JBQ0FaLE1BQUFBO29CQUNBQyxNQUFBQTtnQkFDRjtnQkFFTixPQUFPYTtZQUNUOzs7O1lBRU9DLEtBQUFBO21CQUFQLFNBQU9BLGdCQUFnQmYsSUFBSSxFQUFFQyxJQUFJLEVBQUU7Z0JBQ2pDLElBQU1lLFdBQVcsSUExQ0FqQixTQTBDYUMsTUFBTUM7Z0JBRXBDLE9BQU9lO1lBQ1Q7OztZQUVPQyxLQUFBQTttQkFBUCxTQUFPQSx1QkFBdUJILElBQUksRUFBRUksV0FBVyxFQUFFO2dCQUMvQyxJQUFNLEFBQUVsQixPQUFTYyxLQUFUZDtnQkFFUixJQUFJLEFBQUVDLE9BQVNhLEtBQVRiO2dCQUVOYSxPQUFPYixNQUFPLEdBQUc7Z0JBRWpCQSxPQUFPa0IsYUFBSSxDQUFDRixzQkFBc0IsQ0FBQ0gsTUFBTUk7Z0JBRXpDLElBQU1WLFdBQVdQLEtBQUtDLE9BQU87Z0JBRTdCRCxPQUFPaUIsWUFBWUUsa0JBQWtCLENBQUNaLFdBQVcsR0FBRztnQkFFcEQsSUFBTVEsV0FBVyxJQTVEQWpCLFNBNERhQyxNQUFNQztnQkFFcEMsT0FBT2U7WUFDVDs7O1dBL0RtQmpCIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy92YXJpYWJsZS5qcyIsIjw8anN4LWNvbmZpZy1wcmFnbWEuanM+PiJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFR5cGUgZnJvbSBcIi4vdHlwZVwiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBWYXJpYWJsZSB7XG4gIGNvbnN0cnVjdG9yKG5hbWUsIHR5cGUpIHtcbiAgICB0aGlzLm5hbWUgPSBuYW1lO1xuICAgIHRoaXMudHlwZSA9IHR5cGU7XG4gIH1cblxuICBnZXROYW1lKCkge1xuICAgIHJldHVybiB0aGlzLm5hbWU7XG4gIH1cblxuICBnZXRUeXBlKCkge1xuICAgIHJldHVybiB0aGlzLnR5cGU7XG4gIH1cblxuICBtYXRjaE5hbWUobmFtZSkge1xuICAgIGNvbnN0IG1hdGNoZXNOYW1lID0gKHRoaXMubmFtZSA9PT0gbmFtZSk7XG5cbiAgICByZXR1cm4gbWF0Y2hlc05hbWU7XG4gIH1cblxuICBhc1N0cmluZyh0b2tlbnMpIHtcbiAgICBjb25zdCB0eXBlTmFtZSA9IHRoaXMudHlwZS5nZXROYW1lKCksXG4gICAgICAgICAgc3RyaW5nID0gYCR7dGhpcy5uYW1lfToke3R5cGVOYW1lfWA7XG5cbiAgICByZXR1cm4gc3RyaW5nO1xuICB9XG5cbiAgdG9KU09OKHRva2Vucykge1xuICAgIGNvbnN0IHR5cGVKU09OID0gdGhpcy50eXBlLnRvSlNPTih0b2tlbnMpLFxuICAgICAgICAgIG5hbWUgPSB0aGlzLm5hbWUsIC8vL1xuICAgICAgICAgIHR5cGUgPSB0eXBlSlNPTiwgIC8vL1xuICAgICAgICAgIGpzb24gPSB7XG4gICAgICAgICAgICBuYW1lLFxuICAgICAgICAgICAgdHlwZVxuICAgICAgICAgIH07XG5cbiAgICByZXR1cm4ganNvbjtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tTmFtZUFuZFR5cGUobmFtZSwgdHlwZSkge1xuICAgIGNvbnN0IHZhcmlhYmxlID0gbmV3IFZhcmlhYmxlKG5hbWUsIHR5cGUpO1xuXG4gICAgcmV0dXJuIHZhcmlhYmxlO1xuICB9XG5cbiAgc3RhdGljIGZyb21KU09OQW5kRmlsZUNvbnRleHQoanNvbiwgZmlsZUNvbnRleHQpIHtcbiAgICBjb25zdCB7IG5hbWUgfSA9IGpzb247XG5cbiAgICBsZXQgeyB0eXBlIH0gPSBqc29uO1xuXG4gICAganNvbiA9IHR5cGU7ICAvLy9cblxuICAgIHR5cGUgPSBUeXBlLmZyb21KU09OQW5kRmlsZUNvbnRleHQoanNvbiwgZmlsZUNvbnRleHQpO1xuXG4gICAgY29uc3QgdHlwZU5hbWUgPSB0eXBlLmdldE5hbWUoKTtcblxuICAgIHR5cGUgPSBmaWxlQ29udGV4dC5maW5kVHlwZUJ5VHlwZU5hbWUodHlwZU5hbWUpOyAvLy9cblxuICAgIGNvbnN0IHZhcmlhYmxlID0gbmV3IFZhcmlhYmxlKG5hbWUsIHR5cGUpO1xuXG4gICAgcmV0dXJuIHZhcmlhYmxlO1xuICB9XG59XG4iLCJSZWFjdC5jcmVhdGVFbGVtZW50Il0sIm5hbWVzIjpbIlZhcmlhYmxlIiwibmFtZSIsInR5cGUiLCJnZXROYW1lIiwiZ2V0VHlwZSIsIm1hdGNoTmFtZSIsIm1hdGNoZXNOYW1lIiwiYXNTdHJpbmciLCJ0b2tlbnMiLCJ0eXBlTmFtZSIsInN0cmluZyIsInRvSlNPTiIsInR5cGVKU09OIiwianNvbiIsImZyb21OYW1lQW5kVHlwZSIsInZhcmlhYmxlIiwiZnJvbUpTT05BbmRGaWxlQ29udGV4dCIsImZpbGVDb250ZXh0IiwiVHlwZSIsImZpbmRUeXBlQnlUeXBlTmFtZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7ZUFJcUJBOzs7eURBRko7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFRixJQUFBLEFBQU1BLHlCQUFOO2FBQU1BLFNBQ1BDLElBQUksRUFBRUMsSUFBSTs4QkFESEY7UUFFakIsSUFBSSxDQUFDQyxJQUFJLEdBQUdBO1FBQ1osSUFBSSxDQUFDQyxJQUFJLEdBQUdBOztpQkFIS0Y7O1lBTW5CRyxLQUFBQTttQkFBQUEsU0FBQUEsVUFBVTtnQkFDUixPQUFPLElBQUksQ0FBQ0YsSUFBSTtZQUNsQjs7O1lBRUFHLEtBQUFBO21CQUFBQSxTQUFBQSxVQUFVO2dCQUNSLE9BQU8sSUFBSSxDQUFDRixJQUFJO1lBQ2xCOzs7WUFFQUcsS0FBQUE7bUJBQUFBLFNBQUFBLFVBQVVKLElBQUksRUFBRTtnQkFDZCxJQUFNSyxjQUFlLElBQUksQ0FBQ0wsSUFBSSxLQUFLQTtnQkFFbkMsT0FBT0s7WUFDVDs7O1lBRUFDLEtBQUFBO21CQUFBQSxTQUFBQSxTQUFTQyxNQUFNLEVBQUU7Z0JBQ2YsSUFBTUMsV0FBVyxJQUFJLENBQUNQLElBQUksQ0FBQ0MsT0FBTyxJQUM1Qk8sU0FBUyxBQUFDLEdBQWVELE9BQWIsSUFBSSxDQUFDUixJQUFJLEVBQUMsS0FBWSxPQUFUUTtnQkFFL0IsT0FBT0M7WUFDVDs7O1lBRUFDLEtBQUFBO21CQUFBQSxTQUFBQSxPQUFPSCxNQUFNLEVBQUU7Z0JBQ2IsSUFBTUksV0FBVyxJQUFJLENBQUNWLElBQUksQ0FBQ1MsTUFBTSxDQUFDSCxTQUM1QlAsT0FBTyxJQUFJLENBQUNBLElBQUksRUFDaEJDLE9BQU9VLFVBQ1BDLE9BQU87b0JBQ0xaLE1BQUFBO29CQUNBQyxNQUFBQTtnQkFDRjtnQkFFTixPQUFPVztZQUNUOzs7O1lBRU9DLEtBQUFBO21CQUFQLFNBQU9BLGdCQUFnQmIsSUFBSSxFQUFFQyxJQUFJLEVBQUU7Z0JBQ2pDLElBQU1hLFdBQVcsSUF4Q0FmLFNBd0NhQyxNQUFNQztnQkFFcEMsT0FBT2E7WUFDVDs7O1lBRU9DLEtBQUFBO21CQUFQLFNBQU9BLHVCQUF1QkgsSUFBSSxFQUFFSSxXQUFXLEVBQUU7Z0JBQy9DLElBQU0sQUFBRWhCLE9BQVNZLEtBQVRaO2dCQUVSLElBQUksQUFBRUMsT0FBU1csS0FBVFg7Z0JBRU5XLE9BQU9YLE1BQU8sR0FBRztnQkFFakJBLE9BQU9nQixhQUFJLENBQUNGLHNCQUFzQixDQUFDSCxNQUFNSTtnQkFFekMsSUFBTVIsV0FBV1AsS0FBS0MsT0FBTztnQkFFN0JELE9BQU9lLFlBQVlFLGtCQUFrQixDQUFDVixXQUFXLEdBQUc7Z0JBRXBELElBQU1NLFdBQVcsSUExREFmLFNBMERhQyxNQUFNQztnQkFFcEMsT0FBT2E7WUFDVDs7O1dBN0RtQmYifQ==

package/package.json

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

package/src/axiom.js

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

package/src/axiomLemmaTheoremConjecture.js

@@ -79,8 +79,7 @@ export default class AxiomLemmaTheoremConjecture {
   }
 
   toJSON(tokens) {
-    const { kind } = this.constructor,
-          labelsJSON = this.labels.map((label) => {
+    const labelsJSON = this.labels.map((label) => {
             const labelJSON = label.toJSON(tokens);
 
             return labelJSON;
@@ -95,7 +94,6 @@ export default class AxiomLemmaTheoremConjecture {
           suppositions = suppositionsJSON,  ///
           consequence = consequenceJSON,  ///
           json = {
-            kind,
             labels,
             suppositions,
             consequence

package/src/combinator.js

@@ -1,7 +1,6 @@
 "use strict";
 
 import { nodeAsString } from "./utilities/string";
-import { COMBINATOR_KIND } from "./kinds";
 import { statementNodeFromStatementString } from "./utilities/node";
 
 export default class Combinator {
@@ -25,10 +24,8 @@ export default class Combinator {
 
   toJSON(tokens) {
     const statementString = nodeAsString(this.statementNode, tokens),
-          kind = COMBINATOR_KIND,
           statement = statementString,  ///
           json = {
-            kind,
             statement
           };
 

package/src/conjecture.js

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

package/src/constructor.js

@@ -3,7 +3,6 @@
 import Type from "./type";
 
 import { nodeAsString } from "./utilities/string";
-import { CONSTRUCTOR_KIND } from "./kinds";
 import { termNodeFromTermString } from "./utilities/node";
 
 export default class Constructor {
@@ -42,11 +41,9 @@ export default class Constructor {
           typeJSON = (this.type === null) ?
                         null :
                           this.type.toJSON(tokens),
-          kind = CONSTRUCTOR_KIND,
           term = termString,  ///
           type = typeJSON,  ///
           json = {
-            kind,
             term,
             type
           };

package/src/context/file.js

@@ -16,16 +16,6 @@ import Metavariable from "../metavariable";
 import { push, filter } from "../utilities/array";
 import { statementMetaType } from "../metaType";
 import { nodeAsString, nodesAsString } from "../utilities/string";
-import { TYPE_KIND,
-         RULE_KIND,
-         AXIOM_KIND,
-         LEMMA_KIND,
-         THEOREM_KIND,
-         VARIABLE_KIND,
-         CONJECTURE_KIND,
-         COMBINATOR_KIND,
-         CONSTRUCTOR_KIND,
-         METAVARIABLE_KIND } from "../kinds";
 
 const metaTypes = [
   statementMetaType
@@ -65,6 +55,10 @@ export default class FileContext {
     return this.node;
   }
 
+  getLexer() { return this.releaseContext.getLexer(); }
+
+  getParser() { return this.releaseContext.getParser(); }
+
   getProofSteps() {
     const proofSteps = [];  ///
 
@@ -502,159 +496,185 @@ export default class FileContext {
   fatal(message, node) { this.releaseContext.fatal(message, node, this.tokens, this.filePath); }
 
   toJSON() {
-    const json = [];
+    const filePath =  this.filePath,
+          types = this.types.map((type) => {
+            const typeJSON = type.toJSON(this.tokens);
 
-    this.types.forEach((type) => {
-      const typeJSON = type.toJSON(this.tokens);
+            type = typeJSON; ///
 
-      json.push(typeJSON);
-    });
+            return type;
+          }),
+          rules = this.rules.map((rule) => {
+            const ruleJSON = rule.toJSON(this.tokens);
 
-    this.rules.forEach((rule) => {
-      const ruleJSON = rule.toJSON(this.tokens);
+            rule = ruleJSON; ///
 
-      json.push(ruleJSON);
-    });
+            return rule;
+          }),
+          axioms = this.axioms.map((axiom) => {
+            const axiomJSON = axiom.toJSON(this.tokens);
 
-    this.axioms.forEach((axiom) => {
-      const axiomJSON = axiom.toJSON(this.tokens);
+            axiom = axiomJSON; ///
 
-      json.push(axiomJSON);
-    });
+            return axiom;
+          }),
+          lemmas = this.lemmas.map((lemma) => {
+            const lemmaJSON = lemma.toJSON(this.tokens);
 
-    this.lemmas.forEach((lemma) => {
-      const lemmaJSON = lemma.toJSON(this.tokens);
+            lemma = lemmaJSON; ///
 
-      json.push(lemmaJSON);
-    });
+            return lemma;
+          }),
+          theorems = this.theorems.map((theorem) => {
+            const theoremJSON = theorem.toJSON(this.tokens);
 
-    this.theorems.forEach((theorem) => {
-      const theoremJSON = theorem.toJSON(this.tokens);
+            theorem = theoremJSON; ///
 
-      json.push(theoremJSON);
-    });
+            return theorem;
+          }),
+          variables = this.variables.map((variable) => {
+            const variableJSON = variable.toJSON(this.tokens);
 
-    this.variables.forEach((variable) => {
-      const variableJSON = variable.toJSON(this.tokens);
+            variable = variableJSON;  ///
 
-      json.push(variableJSON)
-    });
+            return variable;
+          }),
+          conjectures = this.conjectures.map((conjecture) => {
+            const conjectureJSON = conjecture.toJSON(this.tokens);
 
-    this.conjectures.forEach((conjecture) => {
-      const conjectureJSON = conjecture.toJSON(this.tokens);
+            conjecture = conjectureJSON; ///
 
-      json.push(conjectureJSON);
-    });
+            return conjecture;
+          }),
+          combinators = this.combinators.map((combinator) => {
+            const combinatorJSON = combinator.toJSON(this.tokens);
 
-    this.combinators.forEach((combinator) => {
-      const combinatorJSON = combinator.toJSON(this.tokens);
+            combinator = combinatorJSON; ///
 
-      json.push(combinatorJSON);
-    });
+            return combinator;
+          }),
+          constructors = this.constructors.map((constructor) => {
+            const constructorJSON = constructor.toJSON(this.tokens);
 
-    this.constructors.forEach((constructor) => {
-      const constructorJSON = constructor.toJSON(this.tokens);
+            constructor = constructorJSON;  ///
 
-      json.push(constructorJSON)
-    });
+            return constructor;
+          }),
+          metavariables = this.metavariables.map((metavariable) => {
+            const metavariableJSON = metavariable.toJSON(this.tokens);
 
-    this.metavariables.forEach((metavariable) => {
-      const metavariableJSON = metavariable.toJSON(this.tokens);
+            metavariable = metavariableJSON;  ///
 
-      json.push(metavariableJSON)
-    });
+            return metavariable;
+          }),
+          json = {
+            filePath,
+            types,
+            rules,
+            axioms,
+            lemmas,
+            theorems,
+            variables,
+            conjectures,
+            combinators,
+            constructors,
+            metavariables
+          };
 
     return json;
   }
 
   initialise(json) {
-    const jsonArray = json, ///
-          fileContext = this; ///
-
-    jsonArray.forEach((json) => {
-      const { kind } = json;
-
-      switch (kind) {
-        case TYPE_KIND: {
-          const type = Type.fromJSONAndFileContext(json, fileContext);
-
-          this.types.push(type);
-
-          break;
-        }
-
-        case RULE_KIND: {
-          const rule = Rule.fromJSONAndFileContext(json, fileContext);
-
-          this.rules.push(rule);
-
-          break;
-        }
-
-        case AXIOM_KIND: {
-          const axiom = Axiom.fromJSONAndFileContext(json, fileContext);
-
-          this.axioms.push(axiom);
-
-          break;
-        }
-
-        case LEMMA_KIND: {
-          const lemma = Lemma.fromJSONAndFileContext(json, fileContext);
-
-          this.lemmas.push(lemma);
-
-          break;
-        }
+    const fileContext = this, ///
+          { types,
+            rules,
+            axioms,
+            lemmas,
+            theorems,
+            variables,
+            conjectures,
+            combinators,
+            constructors,
+            metavariables } = json,
+          typesJSON = types,
+          rulesJSON = rules,
+          axiomsJSON = axioms,
+          lemmasJSON = lemmas,
+          theoremsJSON = theorems,
+          variablesJSON = variables,
+          conjecturesJSON = conjectures,
+          combinatorsJSON = combinators,
+          constructorsJSON = constructors,
+          metavariablesJSON = metavariables;
+
+    typesJSON.forEach((typeJSON) => {
+      const json = typeJSON,  ///
+            type = Type.fromJSONAndFileContext(json, fileContext);
+
+      this.types.push(type);
+    });
 
-        case THEOREM_KIND: {
-          const theorem = Theorem.fromJSONAndFileContext(json, fileContext);
+    rulesJSON.forEach((ruleJSON) => {
+      const json = ruleJSON,  ///
+            rule = Rule.fromJSONAndFileContext(json, fileContext);
 
-          this.theorems.push(theorem);
+      this.rules.push(rule);
+    });
 
-          break;
-        }
+    axiomsJSON.forEach((axiomJSON) => {
+      const json = axiomJSON,  ///
+            axiom = Axiom.fromJSONAndFileContext(json, fileContext);
 
-        case VARIABLE_KIND: {
-          const variable = Variable.fromJSONAndFileContext(json, fileContext);
+      this.axioms.push(axiom);
+    });
 
-          this.variables.push(variable);
+    lemmasJSON.forEach((lemmaJSON) => {
+      const json = lemmaJSON,  ///
+            lemma = Lemma.fromJSONAndFileContext(json, fileContext);
 
-          break;
-        }
+      this.lemmas.push(lemma);
+    });
 
-        case CONJECTURE_KIND: {
-          const conjecture = Conjecture.fromJSONAndFileContext(json, fileContext);
+    theoremsJSON.forEach((theoremJSON) => {
+      const json = theoremJSON,  ///
+            theorem = Theorem.fromJSONAndFileContext(json, fileContext);
 
-          this.conjectures.push(conjecture);
+      this.theorems.push(theorem);
+    });
 
-          break;
-        }
+    variablesJSON.forEach((variableJSON) => {
+      const json = variableJSON,  ///
+            variable = Variable.fromJSONAndFileContext(json, fileContext);
 
-        case COMBINATOR_KIND: {
-          const combinator = Combinator.fromJSONAndFileContext(json, fileContext);
+      this.variables.push(variable);
+    });
 
-          this.combinators.push(combinator);
+    conjecturesJSON.forEach((conjectureJSON) => {
+      const json = conjectureJSON,  ///
+            conjecture = Conjecture.fromJSONAndFileContext(json, fileContext);
 
-          break;
-        }
+      this.conjectures.push(conjecture);
+    });
 
-        case CONSTRUCTOR_KIND: {
-          const constructor = Constructor.fromJSONAndFileContext(json, fileContext);
+    combinatorsJSON.forEach((combinatorJSON) => {
+      const json = combinatorJSON,  ///
+            combinator = Combinator.fromJSONAndFileContext(json, fileContext);
 
-          this.constructors.push(constructor);
+      this.combinators.push(combinator);
+    });
 
-          break;
-        }
+    constructorsJSON.forEach((constructorJSON) => {
+      const json = constructorJSON,  ///
+            constructor = Constructor.fromJSONAndFileContext(json, fileContext);
 
-        case METAVARIABLE_KIND: {
-          const metavariable = Metavariable.fromJSONAndFileContext(json, fileContext);
+      this.constructors.push(constructor);
+    });
 
-          this.metavariables.push(metavariable);
+    metavariablesJSON.forEach((metavariableJSON) => {
+      const json = metavariableJSON,  ///
+            metavariable = Metavariable.fromJSONAndFileContext(json, fileContext);
 
-          break;
-        }
-      }
+      this.metavariables.push(metavariable);
     });
   }