occam-verify-cli 0.0.443 → 0.0.445

package/lib/utilities/releaseContext.js

@@ -67,7 +67,7 @@ function createReleaseContext(dependency, dependentNames, context, callback) {
         createDependencyReleaseContexts(dependency, dependentNames, context, callback);
     }, context);
 }
-function initialiseReleaseContext(dependency, context) {
+function initialiseReleaseContext(dependency, dependentName, verified, context) {
     var releaseContextMap = context.releaseContextMap, dependencyName = dependency.getName(), releaseName = dependencyName, releaseContext = releaseContextMap[releaseName] || null;
     if (releaseContext === null) {
         return;
@@ -76,9 +76,19 @@ function initialiseReleaseContext(dependency, context) {
     if (initialised) {
         return;
     }
+    var releaseContextVerified = releaseContext.isVerified();
+    if (verified) {
+        if (!releaseContextVerified) {
+            var log = context.log;
+            log.error("Unable to initialise the '".concat(releaseName, "' dependency's context because its '").concat(dependentName, "' dependent is a package."));
+            return;
+        }
+    }
+    verified = releaseContextVerified; ///
+    dependentName = releaseName; ///
     var dependencies = releaseContext.getDependencies();
     dependencies.forEachDependency(function(dependency) {
-        initialiseReleaseContext(dependency, context);
+        initialiseReleaseContext(dependency, dependentName, verified, context);
     });
     var dependencyReleaseContexts = retrieveDependencyReleaseContexts(dependency, context);
     releaseContext.initialise(dependencyReleaseContexts);
@@ -139,4 +149,4 @@ function retrieveDependencyReleaseContexts(dependency, context) {
     return dependencyReleaseContexts;
 }
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/releaseContext.js"],"sourcesContent":["\"use strict\";\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 = null;\n\n    callback(error);\n\n    return;\n  }\n\n  const { releaseContextFromDependencyAndDependentNames } = context;\n\n  releaseContextFromDependencyAndDependentNames(dependency, dependentNames, context, (error, releaseContext) => {\n    if (error) {\n      callback(error);\n\n      return;\n    }\n\n    releaseContextMap[releaseName] = releaseContext;\n\n    if (releaseContext === null) {\n      const { log } = context;\n\n      log.error(`The '${releaseName}' package could not be created.`);\n\n      callback(error);\n\n      return;\n    }\n\n    createDependencyReleaseContexts(dependency, dependentNames, context, callback);\n  }, context);\n}\n\nexport function initialiseReleaseContext(dependency, context) {\n  const { releaseContextMap } = context,\n        dependencyName = dependency.getName(),\n        releaseName = dependencyName, ///\n        releaseContext = releaseContextMap[releaseName] || null;\n\n  if (releaseContext === null) {\n    return;\n  }\n\n  const initialised = releaseContext.isInitialised();\n\n  if (initialised) {\n    return;\n  }\n\n  const dependencies = releaseContext.getDependencies();\n\n  dependencies.forEachDependency((dependency) => {\n    initialiseReleaseContext(dependency, context);\n  });\n\n  const dependencyReleaseContexts = retrieveDependencyReleaseContexts(dependency, context);\n\n  releaseContext.initialise(dependencyReleaseContexts);\n}\n\nexport default {\n  createReleaseContext,\n  initialiseReleaseContext\n};\n\nfunction checkCyclicDependencyExists(dependency, dependentNames, context) {\n  const dependencyName = dependency.getName(),\n        dependentNamesIncludesDependencyName = dependentNames.includes(dependencyName),\n        cyclicDependencyExists = dependentNamesIncludesDependencyName;  ///\n\n  if (cyclicDependencyExists) {\n    const { log } = context,\n          firstDependentName = first(dependentNames),\n          dependencyNames = [  ///\n              ...dependentNames,\n            firstDependentName\n          ],\n          dependencyNamesString = dependencyNames.join(`' -> '`);\n\n    log.error(`There is a cyclic dependency: '${dependencyNamesString}'.`);\n  }\n\n  return cyclicDependencyExists;\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 cyclicDependencyExists = checkCyclicDependencyExists(dependency, dependentNames, context);\n\n    if (cyclicDependencyExists) {\n      const error = null;\n\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  }, () => {\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","releaseContextFromDependencyAndDependentNames","log","createDependencyReleaseContexts","initialised","isInitialised","dependencies","getDependencies","forEachDependency","dependencyReleaseContexts","retrieveDependencyReleaseContexts","initialise","checkCyclicDependencyExists","dependentNamesIncludesDependencyName","includes","cyclicDependencyExists","firstDependentName","first","dependencyNames","dependencyNamesString","join","asynchronousForEachDependency","next","done","dependencyReleaseContextsIncludesReleaseContext","push"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/releaseContext.js"],"sourcesContent":["\"use strict\";\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 = null;\n\n    callback(error);\n\n    return;\n  }\n\n  const { releaseContextFromDependencyAndDependentNames } = context;\n\n  releaseContextFromDependencyAndDependentNames(dependency, dependentNames, context, (error, releaseContext) => {\n    if (error) {\n      callback(error);\n\n      return;\n    }\n\n    releaseContextMap[releaseName] = releaseContext;\n\n    if (releaseContext === null) {\n      const { log } = context;\n\n      log.error(`The '${releaseName}' package could not be created.`);\n\n      callback(error);\n\n      return;\n    }\n\n    createDependencyReleaseContexts(dependency, dependentNames, context, callback);\n  }, context);\n}\n\nexport function initialiseReleaseContext(dependency, dependentName, verified, context) {\n  const { releaseContextMap } = context,\n        dependencyName = dependency.getName(),\n        releaseName = dependencyName, ///\n        releaseContext = releaseContextMap[releaseName] || null;\n\n  if (releaseContext === null) {\n    return;\n  }\n\n  const initialised = releaseContext.isInitialised();\n\n  if (initialised) {\n    return;\n  }\n\n  const releaseContextVerified = releaseContext.isVerified();\n\n  if (verified) {\n    if (!releaseContextVerified) {\n      const { log } = context;\n\n      log .error(`Unable to initialise the '${releaseName}' dependency's context because its '${dependentName}' dependent is a package.`);\n\n      return;\n    }\n  }\n\n  verified = releaseContextVerified;  ///\n\n  dependentName = releaseName;  ///\n\n  const dependencies = releaseContext.getDependencies();\n\n  dependencies.forEachDependency((dependency) => {\n    initialiseReleaseContext(dependency, dependentName, verified, context);\n  });\n\n  const dependencyReleaseContexts = retrieveDependencyReleaseContexts(dependency, context);\n\n  releaseContext.initialise(dependencyReleaseContexts);\n}\n\nexport default {\n  createReleaseContext,\n  initialiseReleaseContext\n};\n\nfunction checkCyclicDependencyExists(dependency, dependentNames, context) {\n  const dependencyName = dependency.getName(),\n        dependentNamesIncludesDependencyName = dependentNames.includes(dependencyName),\n        cyclicDependencyExists = dependentNamesIncludesDependencyName;  ///\n\n  if (cyclicDependencyExists) {\n    const { log } = context,\n          firstDependentName = first(dependentNames),\n          dependencyNames = [  ///\n              ...dependentNames,\n            firstDependentName\n          ],\n          dependencyNamesString = dependencyNames.join(`' -> '`);\n\n    log.error(`There is a cyclic dependency: '${dependencyNamesString}'.`);\n  }\n\n  return cyclicDependencyExists;\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 cyclicDependencyExists = checkCyclicDependencyExists(dependency, dependentNames, context);\n\n    if (cyclicDependencyExists) {\n      const error = null;\n\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  }, () => {\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","releaseContextFromDependencyAndDependentNames","log","createDependencyReleaseContexts","dependentName","verified","initialised","isInitialised","releaseContextVerified","isVerified","dependencies","getDependencies","forEachDependency","dependencyReleaseContexts","retrieveDependencyReleaseContexts","initialise","checkCyclicDependencyExists","dependentNamesIncludesDependencyName","includes","cyclicDependencyExists","firstDependentName","first","dependencyNames","dependencyNamesString","join","asynchronousForEachDependency","next","done","dependencyReleaseContextsIncludesReleaseContext","push"],"mappings":"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"}

package/lib/verify/file.js

@@ -16,19 +16,24 @@ function _interopRequireDefault(obj) {
         default: obj
     };
 }
-var topLevelDeclarationNodesQuery = (0, _query.nodesQuery)("/document/topLevelDeclaration");
+var errorNodesQuery = (0, _query.nodesQuery)("/document/error"), topLevelDeclarationNodesQuery = (0, _query.nodesQuery)("/document/topLevelDeclaration");
 function verifyFile(filePath, releaseContext) {
     var fileVerified = false;
     releaseContext.debug("Verifying the '".concat(filePath, "' file..."));
-    var fileContext = _file.default.fromReleaseContextAndFilePath(releaseContext, filePath), node = fileContext.getNode(), topLevelDeclarationNodes = topLevelDeclarationNodesQuery(node), topLevelDeclarationsVerified = topLevelDeclarationNodes.every(function(topLevelDeclarationNode) {
-        var topLevelDeclarationVerified = (0, _topLevel.default)(topLevelDeclarationNode, fileContext);
-        if (topLevelDeclarationVerified) {
-            return true;
+    var fileContext = _file.default.fromReleaseContextAndFilePath(releaseContext, filePath), node = fileContext.getNode(), errorNodes = errorNodesQuery(node), errorNodesLength = errorNodes.length;
+    if (errorNodesLength > 0) {
+        releaseContext.error("The '".concat(filePath, "' file cannot be verified because it contains errors."));
+    } else {
+        var topLevelDeclarationNodes = topLevelDeclarationNodesQuery(node), topLevelDeclarationsVerified = topLevelDeclarationNodes.every(function(topLevelDeclarationNode) {
+            var topLevelDeclarationVerified = (0, _topLevel.default)(topLevelDeclarationNode, fileContext);
+            if (topLevelDeclarationVerified) {
+                return true;
+            }
+        });
+        if (topLevelDeclarationsVerified) {
+            releaseContext.addFileContext(fileContext);
+            fileVerified = true;
         }
-    });
-    if (topLevelDeclarationsVerified) {
-        releaseContext.addFileContext(fileContext);
-        fileVerified = true;
     }
     if (fileVerified) {
         releaseContext.info("Verified the '".concat(filePath, "' file."));
@@ -36,4 +41,4 @@ function verifyFile(filePath, releaseContext) {
     return fileVerified;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvZmlsZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IEZpbGVDb250ZXh0IGZyb20gXCIuLi9jb250ZXh0L2ZpbGVcIjtcbmltcG9ydCB2ZXJpZnlUb3BMZXZlbERlY2xhcmF0aW9uIGZyb20gXCIuL2RlY2xhcmF0aW9uL3RvcExldmVsXCI7XG5cbmltcG9ydCB7IG5vZGVzUXVlcnkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5cbmNvbnN0IHRvcExldmVsRGVjbGFyYXRpb25Ob2Rlc1F1ZXJ5ID0gbm9kZXNRdWVyeShcIi9kb2N1bWVudC90b3BMZXZlbERlY2xhcmF0aW9uXCIpO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlGaWxlKGZpbGVQYXRoLCByZWxlYXNlQ29udGV4dCkge1xuICBsZXQgZmlsZVZlcmlmaWVkID0gZmFsc2U7XG5cbiAgcmVsZWFzZUNvbnRleHQuZGVidWcoYFZlcmlmeWluZyB0aGUgJyR7ZmlsZVBhdGh9JyBmaWxlLi4uYCk7XG5cbiAgY29uc3QgZmlsZUNvbnRleHQgPSBGaWxlQ29udGV4dC5mcm9tUmVsZWFzZUNvbnRleHRBbmRGaWxlUGF0aChyZWxlYXNlQ29udGV4dCwgZmlsZVBhdGgpLFxuICAgICAgICBub2RlID0gZmlsZUNvbnRleHQuZ2V0Tm9kZSgpLFxuICAgICAgICB0b3BMZXZlbERlY2xhcmF0aW9uTm9kZXMgPSB0b3BMZXZlbERlY2xhcmF0aW9uTm9kZXNRdWVyeShub2RlKSxcbiAgICAgICAgdG9wTGV2ZWxEZWNsYXJhdGlvbnNWZXJpZmllZCA9IHRvcExldmVsRGVjbGFyYXRpb25Ob2Rlcy5ldmVyeSgodG9wTGV2ZWxEZWNsYXJhdGlvbk5vZGUpID0+IHtcbiAgICAgICAgICBjb25zdCB0b3BMZXZlbERlY2xhcmF0aW9uVmVyaWZpZWQgPSB2ZXJpZnlUb3BMZXZlbERlY2xhcmF0aW9uKHRvcExldmVsRGVjbGFyYXRpb25Ob2RlLCBmaWxlQ29udGV4dCk7XG5cbiAgICAgICAgICBpZiAodG9wTGV2ZWxEZWNsYXJhdGlvblZlcmlmaWVkKSB7XG4gICAgICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICAgICAgICB9XG4gICAgICAgIH0pO1xuXG4gIGlmICh0b3BMZXZlbERlY2xhcmF0aW9uc1ZlcmlmaWVkKSB7XG4gICAgcmVsZWFzZUNvbnRleHQuYWRkRmlsZUNvbnRleHQoZmlsZUNvbnRleHQpO1xuXG4gICAgZmlsZVZlcmlmaWVkID0gdHJ1ZTtcbiAgfVxuXG4gIGlmIChmaWxlVmVyaWZpZWQpIHtcbiAgICByZWxlYXNlQ29udGV4dC5pbmZvKGBWZXJpZmllZCB0aGUgJyR7ZmlsZVBhdGh9JyBmaWxlLmApO1xuICB9XG5cbiAgcmV0dXJuIGZpbGVWZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlGaWxlIiwidG9wTGV2ZWxEZWNsYXJhdGlvbk5vZGVzUXVlcnkiLCJub2Rlc1F1ZXJ5IiwiZmlsZVBhdGgiLCJyZWxlYXNlQ29udGV4dCIsImZpbGVWZXJpZmllZCIsImRlYnVnIiwiZmlsZUNvbnRleHQiLCJGaWxlQ29udGV4dCIsImZyb21SZWxlYXNlQ29udGV4dEFuZEZpbGVQYXRoIiwibm9kZSIsImdldE5vZGUiLCJ0b3BMZXZlbERlY2xhcmF0aW9uTm9kZXMiLCJ0b3BMZXZlbERlY2xhcmF0aW9uc1ZlcmlmaWVkIiwiZXZlcnkiLCJ0b3BMZXZlbERlY2xhcmF0aW9uTm9kZSIsInRvcExldmVsRGVjbGFyYXRpb25WZXJpZmllZCIsInZlcmlmeVRvcExldmVsRGVjbGFyYXRpb24iLCJhZGRGaWxlQ29udGV4dCIsImluZm8iXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVNBOzs7ZUFBd0JBOzs7eURBUEE7NkRBQ2M7cUJBRVg7Ozs7OztBQUUzQixJQUFNQyxnQ0FBZ0NDLElBQUFBLGlCQUFVLEVBQUM7QUFFbEMsU0FBU0YsV0FBV0csUUFBUSxFQUFFQyxjQUFjLEVBQUU7SUFDM0QsSUFBSUMsZUFBZSxLQUFLO0lBRXhCRCxlQUFlRSxLQUFLLENBQUMsQUFBQyxrQkFBMEIsT0FBVEgsVUFBUztJQUVoRCxJQUFNSSxjQUFjQyxhQUFXLENBQUNDLDZCQUE2QixDQUFDTCxnQkFBZ0JELFdBQ3hFTyxPQUFPSCxZQUFZSSxPQUFPLElBQzFCQywyQkFBMkJYLDhCQUE4QlMsT0FDekRHLCtCQUErQkQseUJBQXlCRSxLQUFLLENBQUMsU0FBQ0MseUJBQTRCO1FBQ3pGLElBQU1DLDhCQUE4QkMsSUFBQUEsaUJBQXlCLEVBQUNGLHlCQUF5QlI7UUFFdkYsSUFBSVMsNkJBQTZCO1lBQy9CLE9BQU8sSUFBSTtRQUNiLENBQUM7SUFDSDtJQUVOLElBQUlILDhCQUE4QjtRQUNoQ1QsZUFBZWMsY0FBYyxDQUFDWDtRQUU5QkYsZUFBZSxJQUFJO0lBQ3JCLENBQUM7SUFFRCxJQUFJQSxjQUFjO1FBQ2hCRCxlQUFlZSxJQUFJLENBQUMsQUFBQyxpQkFBeUIsT0FBVGhCLFVBQVM7SUFDaEQsQ0FBQztJQUVELE9BQU9FO0FBQ1QifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvZmlsZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IEZpbGVDb250ZXh0IGZyb20gXCIuLi9jb250ZXh0L2ZpbGVcIjtcbmltcG9ydCB2ZXJpZnlUb3BMZXZlbERlY2xhcmF0aW9uIGZyb20gXCIuL2RlY2xhcmF0aW9uL3RvcExldmVsXCI7XG5cbmltcG9ydCB7IG5vZGVzUXVlcnkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5cbmNvbnN0IGVycm9yTm9kZXNRdWVyeSA9IG5vZGVzUXVlcnkoXCIvZG9jdW1lbnQvZXJyb3JcIiksXG4gICAgICB0b3BMZXZlbERlY2xhcmF0aW9uTm9kZXNRdWVyeSA9IG5vZGVzUXVlcnkoXCIvZG9jdW1lbnQvdG9wTGV2ZWxEZWNsYXJhdGlvblwiKTtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5RmlsZShmaWxlUGF0aCwgcmVsZWFzZUNvbnRleHQpIHtcbiAgbGV0IGZpbGVWZXJpZmllZCA9IGZhbHNlO1xuXG4gIHJlbGVhc2VDb250ZXh0LmRlYnVnKGBWZXJpZnlpbmcgdGhlICcke2ZpbGVQYXRofScgZmlsZS4uLmApO1xuXG4gIGNvbnN0IGZpbGVDb250ZXh0ID0gRmlsZUNvbnRleHQuZnJvbVJlbGVhc2VDb250ZXh0QW5kRmlsZVBhdGgocmVsZWFzZUNvbnRleHQsIGZpbGVQYXRoKSxcbiAgICAgICAgbm9kZSA9IGZpbGVDb250ZXh0LmdldE5vZGUoKSxcbiAgICAgICAgZXJyb3JOb2RlcyA9IGVycm9yTm9kZXNRdWVyeShub2RlKSxcbiAgICAgICAgZXJyb3JOb2Rlc0xlbmd0aCA9IGVycm9yTm9kZXMubGVuZ3RoO1xuXG4gIGlmIChlcnJvck5vZGVzTGVuZ3RoID4gMCkge1xuICAgIHJlbGVhc2VDb250ZXh0LmVycm9yKGBUaGUgJyR7ZmlsZVBhdGh9JyBmaWxlIGNhbm5vdCBiZSB2ZXJpZmllZCBiZWNhdXNlIGl0IGNvbnRhaW5zIGVycm9ycy5gKTtcbiAgfSBlbHNlIHtcbiAgICBjb25zdCB0b3BMZXZlbERlY2xhcmF0aW9uTm9kZXMgPSB0b3BMZXZlbERlY2xhcmF0aW9uTm9kZXNRdWVyeShub2RlKSxcbiAgICAgICAgICB0b3BMZXZlbERlY2xhcmF0aW9uc1ZlcmlmaWVkID0gdG9wTGV2ZWxEZWNsYXJhdGlvbk5vZGVzLmV2ZXJ5KCh0b3BMZXZlbERlY2xhcmF0aW9uTm9kZSkgPT4ge1xuICAgICAgICAgICAgY29uc3QgdG9wTGV2ZWxEZWNsYXJhdGlvblZlcmlmaWVkID0gdmVyaWZ5VG9wTGV2ZWxEZWNsYXJhdGlvbih0b3BMZXZlbERlY2xhcmF0aW9uTm9kZSwgZmlsZUNvbnRleHQpO1xuXG4gICAgICAgICAgICBpZiAodG9wTGV2ZWxEZWNsYXJhdGlvblZlcmlmaWVkKSB7XG4gICAgICAgICAgICAgIHJldHVybiB0cnVlO1xuICAgICAgICAgICAgfVxuICAgICAgICAgIH0pO1xuXG4gICAgaWYgKHRvcExldmVsRGVjbGFyYXRpb25zVmVyaWZpZWQpIHtcbiAgICAgIHJlbGVhc2VDb250ZXh0LmFkZEZpbGVDb250ZXh0KGZpbGVDb250ZXh0KTtcblxuICAgICAgZmlsZVZlcmlmaWVkID0gdHJ1ZTtcbiAgICB9XG4gIH1cblxuICBpZiAoZmlsZVZlcmlmaWVkKSB7XG4gICAgcmVsZWFzZUNvbnRleHQuaW5mbyhgVmVyaWZpZWQgdGhlICcke2ZpbGVQYXRofScgZmlsZS5gKTtcbiAgfVxuXG4gIHJldHVybiBmaWxlVmVyaWZpZWQ7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5RmlsZSIsImVycm9yTm9kZXNRdWVyeSIsIm5vZGVzUXVlcnkiLCJ0b3BMZXZlbERlY2xhcmF0aW9uTm9kZXNRdWVyeSIsImZpbGVQYXRoIiwicmVsZWFzZUNvbnRleHQiLCJmaWxlVmVyaWZpZWQiLCJkZWJ1ZyIsImZpbGVDb250ZXh0IiwiRmlsZUNvbnRleHQiLCJmcm9tUmVsZWFzZUNvbnRleHRBbmRGaWxlUGF0aCIsIm5vZGUiLCJnZXROb2RlIiwiZXJyb3JOb2RlcyIsImVycm9yTm9kZXNMZW5ndGgiLCJsZW5ndGgiLCJlcnJvciIsInRvcExldmVsRGVjbGFyYXRpb25Ob2RlcyIsInRvcExldmVsRGVjbGFyYXRpb25zVmVyaWZpZWQiLCJldmVyeSIsInRvcExldmVsRGVjbGFyYXRpb25Ob2RlIiwidG9wTGV2ZWxEZWNsYXJhdGlvblZlcmlmaWVkIiwidmVyaWZ5VG9wTGV2ZWxEZWNsYXJhdGlvbiIsImFkZEZpbGVDb250ZXh0IiwiaW5mbyJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBVUE7OztlQUF3QkE7Ozt5REFSQTs2REFDYztxQkFFWDs7Ozs7O0FBRTNCLElBQU1DLGtCQUFrQkMsSUFBQUEsaUJBQVUsRUFBQyxvQkFDN0JDLGdDQUFnQ0QsSUFBQUEsaUJBQVUsRUFBQztBQUVsQyxTQUFTRixXQUFXSSxRQUFRLEVBQUVDLGNBQWMsRUFBRTtJQUMzRCxJQUFJQyxlQUFlLEtBQUs7SUFFeEJELGVBQWVFLEtBQUssQ0FBQyxBQUFDLGtCQUEwQixPQUFUSCxVQUFTO0lBRWhELElBQU1JLGNBQWNDLGFBQVcsQ0FBQ0MsNkJBQTZCLENBQUNMLGdCQUFnQkQsV0FDeEVPLE9BQU9ILFlBQVlJLE9BQU8sSUFDMUJDLGFBQWFaLGdCQUFnQlUsT0FDN0JHLG1CQUFtQkQsV0FBV0UsTUFBTTtJQUUxQyxJQUFJRCxtQkFBbUIsR0FBRztRQUN4QlQsZUFBZVcsS0FBSyxDQUFDLEFBQUMsUUFBZ0IsT0FBVFosVUFBUztJQUN4QyxPQUFPO1FBQ0wsSUFBTWEsMkJBQTJCZCw4QkFBOEJRLE9BQ3pETywrQkFBK0JELHlCQUF5QkUsS0FBSyxDQUFDLFNBQUNDLHlCQUE0QjtZQUN6RixJQUFNQyw4QkFBOEJDLElBQUFBLGlCQUF5QixFQUFDRix5QkFBeUJaO1lBRXZGLElBQUlhLDZCQUE2QjtnQkFDL0IsT0FBTyxJQUFJO1lBQ2IsQ0FBQztRQUNIO1FBRU4sSUFBSUgsOEJBQThCO1lBQ2hDYixlQUFla0IsY0FBYyxDQUFDZjtZQUU5QkYsZUFBZSxJQUFJO1FBQ3JCLENBQUM7SUFDSCxDQUFDO0lBRUQsSUFBSUEsY0FBYztRQUNoQkQsZUFBZW1CLElBQUksQ0FBQyxBQUFDLGlCQUF5QixPQUFUcEIsVUFBUztJQUNoRCxDQUFDO0lBRUQsT0FBT0U7QUFDVCJ9

package/package.json

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

package/src/axiom.js

@@ -71,43 +71,38 @@ export default class Axiom {
     return json;
   }
 
-  static fromJSON(json, callback) {
-    let axiom = null;
-
+  static fromJSON(json, releaseContext) {
     let { labels } = json;
 
-    const { statement, consequent, supposition } = json;
+    const labelsJSON = labels;  ///
 
-    labels = labels.reduce((labels, label) => {
-      if (labels !== null) {
-        const json = label; ///
+    labels = labelsJSON.map((labelJSON) => {
+      const json = labelJSON, ///
+            label = Label.fromJSON(json, releaseContext);
 
-        label = Label.fromJSON(json, callback); ///
+      return label;
+    });
 
-        if (label !== null) {
-          labels.push(label);
-        } else {
-          labels = null;
-        }
-      }
+    const { statement, consequent, supposition } = json;
 
-      return labels;
-    }, []);
+    let axiom;
 
-    if (statement !== null) {
+    if (false) {
+      ///
+    } else if (statement !== null) {
       const ruleName = UNQUALIFIED_STATEMENT_RULE_NAME,
             content = `${statement}
 `,
-            unqualifiedStatementNode = callback(content, ruleName),
+            node = releaseContext.nodeFromContentAndRuleName(content, ruleName),
+            unqualifiedStatementNode = node,  ///
             statementNode = statementNodeQuery(unqualifiedStatementNode),
             consequentNode = null,
             suppositionNode = null;
 
       axiom = new Axiom(labels, statementNode, consequentNode, suppositionNode);
-    }
-
-    if ((consequent !== null) && (supposition !== null)) {
-      let content,
+    } else if ((consequent !== null) && (supposition !== null)) {
+      let node,
+          content,
           statementNode,
           unqualifiedStatementNode;
 
@@ -116,7 +111,9 @@ export default class Axiom {
       content = `${consequent}
 `;
 
-      unqualifiedStatementNode = callback(content, ruleName);
+      node = releaseContext.nodeFromContentAndRuleName(content, ruleName);
+
+      unqualifiedStatementNode = node;  ///
 
       statementNode = statementNodeQuery(unqualifiedStatementNode);
 
@@ -125,7 +122,9 @@ export default class Axiom {
       content = `${supposition}
 `;
 
-      unqualifiedStatementNode = callback(content, ruleName);
+      node = releaseContext.nodeFromContentAndRuleName(content, ruleName);
+
+      unqualifiedStatementNode = node;  ///
 
       statementNode = statementNodeQuery(unqualifiedStatementNode);
 

package/src/combinator.js

@@ -34,12 +34,13 @@ export default class Combinator {
     return json;
   }
 
-  static fromJSON(json, callback) {
+  static fromJSON(json, releaseContext) {
     const { statement } = json,
           ruleName = COMBINATOR_DECLARATION_RULE_NAME,
           content = `Combinator ${statement}
 `,
-          combinatorDeclarationNode = callback(content, ruleName),
+          node = releaseContext.nodeFromContentAndRuleName(content, ruleName),
+          combinatorDeclarationNode = node, ///
           statementNode = statementNodeQuery(combinatorDeclarationNode),
           combinator = new Combinator(statementNode);
 

package/src/conclusion.js

@@ -36,19 +36,15 @@ export default class Conclusion {
     return json;
   }
 
-  static fromJSON(json, callback) {
-    let conclusion = null;
-
+  static fromJSON(json, releaseContext) {
     const { metastatement } = json,
           ruleName = UNQUALIFIED_METASTATEMENT_RULE_NAME,
           content = `${metastatement}
 `,
-          unqualifiedMetastatementNode = callback(content, ruleName),
-          metastatementNode = metastatementNodeQuery(unqualifiedMetastatementNode);
-
-    if (metastatementNode !== null) {
-      conclusion = new Conclusion(metastatementNode);
-    }
+          node = releaseContext.nodeFromContentAndRuleName(content, ruleName),
+          unqualifiedMetastatementNode = node,  ///
+          metastatementNode = metastatementNodeQuery(unqualifiedMetastatementNode),
+          conclusion = new Conclusion(metastatementNode);
 
     return conclusion;
   }

package/src/constructor.js

@@ -57,19 +57,26 @@ export default class Constructor {
     return json;
   }
 
-  static fromJSON(json, callback) {
-    let { type } = json;
-
+  static fromJSON(json, releaseContext) {
     const { term } = json,
           ruleName = CONSTRUCTOR_DECLARATION_RULE_NAME,
           content = `Constructor ${term}
 `,
-          constructorDeclarationNode = callback(content, ruleName),
+          node = releaseContext.nodeFromContentAndRuleName(content, ruleName),
+          constructorDeclarationNode = node,  ///
           termNode = statementNodeQuery(constructorDeclarationNode);
 
-    json = type;  ///
+    let { type } = json;
+
+    const typeJSON = type;  ///
+
+    json = typeJSON;  ///
+
+    type = Type.fromJSON(json, releaseContext);
+
+    const typeName = type.getName();
 
-    type = Type.fromJSON(json);
+    type = releaseContext.findTypeByTypeName(typeName); ///
 
     const constructor = new Constructor(termNode, type);
 

package/src/context/file.js

@@ -6,13 +6,13 @@ import { push } from "../utilities/array";
 import { leastLineIndexFromNodeAndTokens, greatestLineIndexFromNodeAndTokens } from "../utilities/tokens";
 
 export default class FileContext {
-  constructor(releaseContext, filePath, tokens, node, rules, types, axioms, variables, combinators, constructors) {
+  constructor(releaseContext, filePath, tokens, node, types, rules, axioms, variables, combinators, constructors) {
     this.releaseContext = releaseContext;
     this.filePath = filePath;
     this.tokens = tokens;
     this.node = node;
-    this.rules = rules;
     this.types = types;
+    this.rules = rules;
     this.axioms = axioms;
     this.variables = variables;
     this.combinators = combinators;
@@ -63,32 +63,32 @@ export default class FileContext {
     return labels;
   }
 
-  getRules(includeRelease = true) {
-    const rules = []
+  getTypes(includeRelease = true) {
+    const types = [];
 
-    push(rules, this.rules);
+    push(types, this.types);
 
     if (includeRelease) {
-      const releaseContextRules = this.releaseContext.getRules();
+      const releaseContextTypes = this.releaseContext.getTypes();
 
-      push(rules, releaseContextRules);
+      push(types, releaseContextTypes);
     }
 
-    return rules;
+    return types;
   }
 
-  getTypes(includeRelease = true) {
-    const types = [];
+  getRules(includeRelease = true) {
+    const rules = []
 
-    push(types, this.types);
+    push(rules, this.rules);
 
     if (includeRelease) {
-      const releaseContextTypes = this.releaseContext.getTypes();
+      const releaseContextRules = this.releaseContext.getRules();
 
-      push(types, releaseContextTypes);
+      push(rules, releaseContextRules);
     }
 
-    return types;
+    return rules;
   }
 
   getAxioms(includeRelease = true) {
@@ -295,18 +295,18 @@ export default class FileContext {
   toJSON() {
     const json = [];
 
-    this.rules.forEach((rule) => {
-      const ruleJSON = rule.toJSON();
-
-      json.push(ruleJSON);
-    });
-
     this.types.forEach((type) => {
       const typeJSON = type.toJSON();
 
       json.push(typeJSON);
     });
 
+    this.rules.forEach((rule) => {
+      const ruleJSON = rule.toJSON();
+
+      json.push(ruleJSON);
+    });
+
     this.axioms.forEach((axiom) => {
       const axiomJSON = axiom.toJSON();
 
@@ -336,13 +336,13 @@ export default class FileContext {
 
     rewriteNodes(node);
 
-    const rules = [],
-          types = [],
+    const types = [],
+          rules = [],
           axioms = [],
           variables = [],
           combinators = [],
           constructors = [],
-          fileContext = new FileContext(releaseContext, filePath, tokens, node, rules, types, axioms, variables, combinators, constructors);
+          fileContext = new FileContext(releaseContext, filePath, tokens, node, types, rules, axioms, variables, combinators, constructors);
 
     return fileContext;
   }

package/src/context/release/file.js

@@ -154,73 +154,65 @@ export default class FileReleaseContext extends ReleaseContext {
     return constructors;
   }
 
-  initialise(dependencyReleaseContexts) {
-    super.initialise(dependencyReleaseContexts);
+  nodeFromContentAndRuleName(content, ruleName) {
+    const ruleMap = this.florenceParser.getRuleMap(),
+          rule = ruleMap[ruleName],
+          tokens = this.florenceLexer.tokenise(content),
+          node = this.florenceParser.parse(tokens, rule);
+
+    if (node !== null) {
+      rewriteNodes(node);
+    }
 
-    const jsonArray = this.contextJSON,  ///
-          callback = (content, ruleName) => {
-            const ruleMap = this.florenceParser.getRuleMap(),
-                  tokens = this.florenceLexer.tokenise(content),
-                  rule = ruleMap[ruleName],
-                  node = this.florenceParser.parse(tokens, rule);
+    return node;
+  }
 
-            if (node !== null) {
-              rewriteNodes(node);
-            }
+  initialise(dependencyReleaseContexts) {
+    super.initialise(dependencyReleaseContexts);
 
-            return node;
-          };
+    const jsonArray = this.contextJSON,
+          releaseContext = this;  ///
 
     jsonArray.forEach((json) => {
       const { kind } = json;
 
       switch (kind) {
         case TYPE_KIND: {
-          const type = Type.fromJSON(json);
+          const type = Type.fromJSON(json, releaseContext);
 
-          if (type !== null) {
-            this.types.push(type);
-          }
+          this.types.push(type);
 
           break;
         }
 
         case RULE_KIND: {
-          const rule = Rule.fromJSON(json, callback);
+          const rule = Rule.fromJSON(json, releaseContext);
 
-          if (rule !== null) {
-            this.rules.push(rule);
-          }
+          this.rules.push(rule);
 
           break;
         }
 
         case AXIOM_KIND: {
-          const axiom = Axiom.fromJSON(json, callback);
+          const axiom = Axiom.fromJSON(json, releaseContext);
 
-          if (axiom !== null) {
-            this.axioms.push(axiom);
-          }
+          this.axioms.push(axiom);
 
           break;
         }
 
         case COMBINATOR_KIND: {
-          const combinator = Combinator.fromJSON(json, callback);
+          const combinator = Combinator.fromJSON(json, releaseContext);
 
-          if (combinator !== null) {
-            this.combinators.push(combinator);
-          }
+          this.combinators.push(combinator);
 
           break;
         }
 
         case CONSTRUCTOR_KIND: {
-          const constructor = Constructor.fromJSON(json, callback);
+          const constructor = Constructor.fromJSON(json, releaseContext);
 
-          if (constructor !== null) {
-            this.constructors.push(constructor);
-          }
+          this.constructors.push(constructor);
 
           break;
         }

package/src/context/release.js

@@ -56,6 +56,19 @@ export default class ReleaseContext {
     return this.dependencyReleaseContexts;
   }
 
+  findTypeByTypeName(typeName) {
+    const types = this.getTypes(),
+          type = types.find((type) => {
+            const matches = type.matchTypeName(typeName);
+
+            if (matches) {
+              return true;
+            }
+          }) || null;
+
+    return type;
+  }
+
   getReleaseName() {
     const name = this.getName(),
           releaseName = name; ///

package/src/label.js

@@ -34,16 +34,11 @@ export default class Label {
     return json;
   }
 
-  static fromJSON(json, callback) {
-    let label = null;
-
+  static fromJSON(json, releaseContext) {
     const content = json, ///
           ruleName = LABEL_RULE_NAME,
-          node = callback(content, ruleName);
-
-    if (node !== null) {
-      label = new Label(node);
-    }
+          node = releaseContext.nodeFromContentAndRuleName(content, ruleName),
+          label = new Label(node);
 
     return label;
   }

package/src/premise.js

@@ -71,19 +71,15 @@ export default class Premise {
     return json;
   }
 
-  static fromJSON(json, callback) {
-    let premise = null;
-
+  static fromJSON(json, releaseContext) {
     const { metastatement } = json,
           ruleName = UNQUALIFIED_METASTATEMENT_RULE_NAME,
           content = `${metastatement}
 `,
-          unqualifiedMetastatementNode = callback(content, ruleName),
-          metastatementNode = metastatementNodeQuery(unqualifiedMetastatementNode);
-
-    if (metastatementNode !== null) {
-      premise = new Premise(metastatementNode);
-    }
+          node = releaseContext.nodeFromContentAndRuleName(content, ruleName),
+          unqualifiedMetastatementNode = node,  ///
+          metastatementNode = metastatementNodeQuery(unqualifiedMetastatementNode),
+          premise = new Premise(metastatementNode);
 
     return premise;
   }

package/src/rule.js

@@ -91,50 +91,40 @@ export default class Rule {
     return json;
   }
 
-  static fromJSON(json, callback) {
-    let rule = null;
+  static fromJSON(json, releaseContext) {
+    let rule;
 
-    let { labels, premises, conclusion } = json;
+    let { labels } = json;
 
-    labels = labels.reduce((labels, label) => {
-      if (labels !== null) {
-        const json = label; ///
+    const labelsJSON = labels;  ///
 
-        label = Label.fromJSON(json, callback); ///
+    labels = labelsJSON.map((labelJSON) => {
+      const json = labelJSON, ///
+            label = Label.fromJSON(json, releaseContext);
 
-        if (label !== null) {
-          labels.push(label);
-        } else {
-          labels = null;
-        }
-      }
+      return label;
+    });
 
-      return labels;
-    }, []);
+    let { premises } = json;
 
-    premises = premises.reduce((premises, premise) => {
-      if (premises !== null) {
-        const json = premise; ///
+    const premisesJSON = premises;  ///
 
-        premise = Premise.fromJSON(json, callback); ///
+    premises = premisesJSON.map((premiseJSON) => {
+      const json = premiseJSON, ///
+            premise = Premise.fromJSON(json, releaseContext);
 
-        if (premise !== null) {
-          premises.push(premise);
-        } else {
-          premises = null;
-        }
-      }
+      return premise;
+    });
 
-      return premises;
-    }, []);
+    let { conclusion } = json;
 
-    json = conclusion;  ///
+    const conclusionJSON = conclusion;  ///
 
-    conclusion = Conclusion.fromJSON(json, callback);
+    json = conclusionJSON;  ///
 
-    if ((labels !== null) && (premises !== null) && (conclusion !== null)) {
-      rule = new Rule(labels, premises, conclusion);
-    }
+    conclusion = Conclusion.fromJSON(json, releaseContext);
+
+    rule = new Rule(labels, premises, conclusion);
 
     return rule;
   }