occam-verify-cli 0.0.443 → 0.0.445

package/src/type.js

@@ -119,15 +119,21 @@ export default class Type {
     return json;
   }
 
-  static fromJSON(json) {
+  static fromJSON(json, releaseContext) {
     const { name } = json;
 
     let { superType } = json;
 
     if (superType !== null) {
-      json = superType; ///
+      const superTypeJSON = superType;  ///
 
-      superType = Type.fromJSON(json);
+      json = superTypeJSON; ///
+
+      superType = Type.fromJSON(json, releaseContext);
+
+      const superTypeName = superType.getName();
+
+      superType = releaseContext.findTypeByTypeName(superTypeName); ///
     }
 
     const type = new Type(name, superType);

package/src/utilities/releaseContext.js

@@ -39,7 +39,7 @@ export function createReleaseContext(dependency, dependentNames, context, callba
   }, context);
 }
 
-export function initialiseReleaseContext(dependency, context) {
+export function initialiseReleaseContext(dependency, dependentName, verified, context) {
   const { releaseContextMap } = context,
         dependencyName = dependency.getName(),
         releaseName = dependencyName, ///
@@ -55,10 +55,26 @@ export function initialiseReleaseContext(dependency, context) {
     return;
   }
 
+  const releaseContextVerified = releaseContext.isVerified();
+
+  if (verified) {
+    if (!releaseContextVerified) {
+      const { log } = context;
+
+      log .error(`Unable to initialise the '${releaseName}' dependency's context because its '${dependentName}' dependent is a package.`);
+
+      return;
+    }
+  }
+
+  verified = releaseContextVerified;  ///
+
+  dependentName = releaseName;  ///
+
   const dependencies = releaseContext.getDependencies();
 
   dependencies.forEachDependency((dependency) => {
-    initialiseReleaseContext(dependency, context);
+    initialiseReleaseContext(dependency, dependentName, verified, context);
   });
 
   const dependencyReleaseContexts = retrieveDependencyReleaseContexts(dependency, context);

package/src/verify/file.js

@@ -5,7 +5,8 @@ import verifyTopLevelDeclaration from "./declaration/topLevel";
 
 import { nodesQuery } from "../utilities/query";
 
-const topLevelDeclarationNodesQuery = nodesQuery("/document/topLevelDeclaration");
+const errorNodesQuery = nodesQuery("/document/error"),
+      topLevelDeclarationNodesQuery = nodesQuery("/document/topLevelDeclaration");
 
 export default function verifyFile(filePath, releaseContext) {
   let fileVerified = false;
@@ -14,19 +15,26 @@ export default function verifyFile(filePath, releaseContext) {
 
   const fileContext = FileContext.fromReleaseContextAndFilePath(releaseContext, filePath),
         node = fileContext.getNode(),
-        topLevelDeclarationNodes = topLevelDeclarationNodesQuery(node),
-        topLevelDeclarationsVerified = topLevelDeclarationNodes.every((topLevelDeclarationNode) => {
-          const topLevelDeclarationVerified = verifyTopLevelDeclaration(topLevelDeclarationNode, fileContext);
-
-          if (topLevelDeclarationVerified) {
-            return true;
-          }
-        });
-
-  if (topLevelDeclarationsVerified) {
-    releaseContext.addFileContext(fileContext);
-
-    fileVerified = true;
+        errorNodes = errorNodesQuery(node),
+        errorNodesLength = errorNodes.length;
+
+  if (errorNodesLength > 0) {
+    releaseContext.error(`The '${filePath}' file cannot be verified because it contains errors.`);
+  } else {
+    const topLevelDeclarationNodes = topLevelDeclarationNodesQuery(node),
+          topLevelDeclarationsVerified = topLevelDeclarationNodes.every((topLevelDeclarationNode) => {
+            const topLevelDeclarationVerified = verifyTopLevelDeclaration(topLevelDeclarationNode, fileContext);
+
+            if (topLevelDeclarationVerified) {
+              return true;
+            }
+          });
+
+    if (topLevelDeclarationsVerified) {
+      releaseContext.addFileContext(fileContext);
+
+      fileVerified = true;
+    }
   }
 
   if (fileVerified) {