occam-verify-cli 0.0.697 → 0.0.698

package/src/verify/typeAssertion.js

@@ -1,165 +1,129 @@
 "use strict";
 
-import Variable from "../variable";
 import VariableAssignment from "../assignment/variable";
+import verifyTermAndStandaloneType from "../verify/termAndStandaloneType";
+import verifyTermAsVariableAndStandaloneType from "../verify/termAsVariableAndStandaloneType";
 
 import { first } from "../utilities/array";
-import { nodeQuery, typeNameFromTypeNode } from "../utilities/query";
-import { verifyTermAsVariable, verifyTermAgainstConstructors } from "../verify/term";
+import { nodeQuery } from "../utilities/query";
 
 const termNodeQuery = nodeQuery("/typeAssertion/term!"),
       typeNodeQuery = nodeQuery("/typeAssertion/type!");
 
 export default function verifyTypeAssertion(typeAssertionNode, assignments, derived, context, verifyAhead) {
-  let typeAssertionVerified = false;
+  let typeAssertionVerified;
 
   const typeAssertionString = context.nodeAsString(typeAssertionNode);
 
   context.trace(`Verifying the '${typeAssertionString}' type assertion...`, typeAssertionNode);
 
-  const typeNode = typeNodeQuery(typeAssertionNode),
-        typeName = typeNameFromTypeNode(typeNode),
-        assertedTypeName = typeName,  ///
-        assertedType = context.findTypeByTypeName(assertedTypeName);
-
-  if (assertedType === null) {
-    context.debug(`The '${typeName}' asserted type is not present.`, typeAssertionNode);
-  } else {
-    const verifyTypeAssertionFunctions = [
-      verifyVariableTypeAssertion,
-      verifyTermTypeAssertion
-    ];
-
-    typeAssertionVerified = verifyTypeAssertionFunctions.some((verifyTypeAssertionFunction) => {
-      const typeAssertionVerified = verifyTypeAssertionFunction(typeAssertionNode, assertedType, assignments, derived, context, verifyAhead);
-
-      if (typeAssertionVerified) {
-        return true;
-      }
-    });
-  }
+  const verifyTypeAssertionFunctions = [
+    verifyDerivedTypeAssertion,
+    verifyStandaloneTypeAssertion
+  ];
+
+  typeAssertionVerified = verifyTypeAssertionFunctions.some((verifyTypeAssertionFunction) => {
+    const typeAssertionVerified = verifyTypeAssertionFunction(typeAssertionNode, assignments, derived, context, verifyAhead);
+
+    if (typeAssertionVerified) {
+      return true;
+    }
+  });
 
   if (typeAssertionVerified) {
-    context.debug(`...verified the '${typeAssertionString}' statement type assertion.`, typeAssertionNode);
+    context.debug(`...verified the '${typeAssertionString}' type assertion.`, typeAssertionNode);
   }
 
   return typeAssertionVerified;
 }
 
-export function verifyVariableTypeAssertion(typeAssertionNode, assertedType, assignments, derived, context, verifyAhead) {
-  let variableTypeAssertionVerified;
-
-  const typeAssertionString = context.nodeAsString(typeAssertionNode);
-
-  context.trace(`Verifying the '${typeAssertionString}' variable type assertion...`, typeAssertionNode);
+function verifyDerivedTypeAssertion(typeAssertionNode, assignments, derived, context, verifyAhead) {
+  let derivedTypeAssertionVerified = false;
 
-  const variables = [],
-        termNode = termNodeQuery(typeAssertionNode),
-        termVerifiedAsVariable = verifyTermAsVariable(termNode, variables, context, () => {
-          let verifiedAhead = false;
+  if (derived) {
+    const typeAssertionString = context.nodeAsString(typeAssertionNode);
 
-          const firstVariable = first(variables),
-                variable = firstVariable, ///
-                variableName = variable.getName(),
-                variableType = variable.getType();
+    context.trace(`Verifying the '${typeAssertionString}' derived type assertion...`, typeAssertionNode);
 
-          if (derived) {
-            const assertedTypeEqualToOrSuperTypeOfVariableType = assertedType.isEqualToOrSuperTypeOf(variableType);
+    const terms = [],
+          types = [],
+          termNode = termNodeQuery(typeAssertionNode),
+          typeNode = typeNodeQuery(typeAssertionNode),
+          termAndStandaloneTypeVerified = verifyTermAndStandaloneType(termNode, typeNode, terms, types, context, () => {
+            let verifiedAhead = false;
 
-            if (!assertedTypeEqualToOrSuperTypeOfVariableType) {
-              const assertedTypeName = assertedType.getName(),
-                    variableTypeName = variableType.getName();
-
-              context.debug(`The '${assertedTypeName}' asserted type is not equal to or a super-type of the '${variableName}' variable's '${variableTypeName}' type.`, typeAssertionNode);
-            } else {
-              verifiedAhead = verifyAhead();
-            }
-          } else {
-            const assertedTypeEqualToOrSubTypeOfVariableType = assertedType.isEqualToOrSubTypeOf(variableType);
-
-            if (!assertedTypeEqualToOrSubTypeOfVariableType) {
-              const assertedTypeName = assertedType.getName(),
-                    variableTypeName = variableType.getName();
-
-              context.debug(`The '${assertedTypeName}' asserted type is not equal to or a sub-type of the '${variableName}' variable's '${variableTypeName}' type.`, typeAssertionNode);
-            } else {
-              const name = variableName,  ///
-                    type = assertedType,  ///
-                    variable = Variable.fromNameAndType(name, type),
-                    variableAssignment = VariableAssignment.fromVariable(variable),
-                    assignment = variableAssignment; ///
-
-              assignments.push(assignment);
+            const firstTerm = first(terms),
+                  firstType = first(types),
+                  term = firstTerm, ///
+                  type = firstType, ///
+                  termType = term.getType(),
+                  termTypeEqualToOrSuperTypeOfType = termType.isEqualToOrSuperTypeOf(type);
 
-              verifiedAhead = verifyAhead();
+            if (termTypeEqualToOrSuperTypeOfType) {
+              debugger
 
-              if (!verifiedAhead) {
-                assignments.pop();
+              if (false) {  ///
+                verifiedAhead = verifyAhead();
               }
             }
-          }
 
-          return verifiedAhead;
-        });
+            return verifiedAhead;
+          });
 
-  variableTypeAssertionVerified = termVerifiedAsVariable; ///
+    derivedTypeAssertionVerified = termAndStandaloneTypeVerified; ///
 
-  if (variableTypeAssertionVerified) {
-    context.debug(`...verified the '${typeAssertionString}' variable type assertion.`, typeAssertionNode);
+    if (derivedTypeAssertionVerified) {
+      context.trace(`...verified the '${typeAssertionString}' derived type assertion.`, typeAssertionNode);
+    }
   }
 
-  return variableTypeAssertionVerified;
+  return derivedTypeAssertionVerified;
 }
 
-function verifyTermTypeAssertion(typeAssertionNode, assertedType, assignments, derived, context, verifyAhead) {
-  let termTypeAssertionVerified;
+function verifyStandaloneTypeAssertion(typeAssertionNode, assignments, derived, context, verifyAhead) {
+  let standaloneTypeAssertionVerified = false;
 
-  const typeAssertionString = context.nodeAsString(typeAssertionNode);
+  if (!derived) {
+    const typeAssertionString = context.nodeAsString(typeAssertionNode);
 
-  context.trace(`Verifying the '${typeAssertionString}' term type assertion...`, typeAssertionNode);
+    context.trace(`Verifying the '${typeAssertionString}' standalone type assertion...`, typeAssertionNode);
 
-  const types = [],
-        termNode = termNodeQuery(typeAssertionNode),
-        termVerifiedAgainstConstructors = verifyTermAgainstConstructors(termNode, types, context, () => {
-          let verifiedAhead = false;
+    const types = [],
+          variables = [],
+          termNode = termNodeQuery(typeAssertionNode),
+          typeNode = typeNodeQuery(typeAssertionNode),
+          termAsVariableAndStandaloneTypeVerified = verifyTermAsVariableAndStandaloneType(termNode, typeNode, variables, types, context, () => {
+            let verifiedAhead = false;
 
-          const firstType = first(types),
-                termType = firstType; ///
+            const firstVariable = first(variables),
+                  firstType = first(types),
+                  variable = firstVariable, ///
+                  type = firstType, ///
+                  variableType = variable.getType(),
+                  variableTypeEqualToOrSuperTypeOfType = variableType.isEqualToOrSuperTypeOf(type);
 
-          if (derived) {
-            const assertedTypeIsEqualToOrSuperTypeOfTermType = assertedType.isEqualToOrSuperTypeOf(termType);
+            if (variableTypeEqualToOrSuperTypeOfType) {
+              const variableAssignment = VariableAssignment.fromVariable(variable),
+                    assignment = variableAssignment; ///
 
-            if (!assertedTypeIsEqualToOrSuperTypeOfTermType) {
-              const termString = context.nodeAsString(termNode),
-                    termTypeName = termType.getName(),
-                    assertedTypeName = assertedType.getName();
+              assignments.push(assignment);
 
-              context.debug(`The '${assertedTypeName}' asserted type is not equal to or a super-type of the '${termString}' term's '${termTypeName}' type.`, typeAssertionNode);
-            } else {
               verifiedAhead = verifyAhead();
-            }
-          } else {
-            const assertedTypeIsEqualToOrSubTypeOfTermType = assertedType.isEqualToOrSubTypeOf(termType);
-
-            if (!assertedTypeIsEqualToOrSubTypeOfTermType) {
-              const termString = context.nodeAsString(termNode),
-                    termTypeName = termType.getName(),
-                    assertedTypeName = assertedType.getName();
 
-              context.debug(`The '${assertedTypeName}' asserted type is not equal to or a sub-type of the '${termString}' term's '${termTypeName}' type.`, typeAssertionNode);
-            } else {
-              verifiedAhead = verifyAhead();
+              if (!verifiedAhead) {
+                assignments.pop();
+              }
             }
-          }
 
-          return verifiedAhead;
-        });
+            return verifiedAhead;
+          });
 
-  termTypeAssertionVerified = termVerifiedAgainstConstructors;  ///
+    standaloneTypeAssertionVerified = termAsVariableAndStandaloneTypeVerified; ///
 
-  if (termTypeAssertionVerified) {
-    context.debug(`...verified the '${typeAssertionString}' term type assertion.`, typeAssertionNode);
+    if (standaloneTypeAssertionVerified) {
+      context.trace(`...verified the '${typeAssertionString}' standalone type assertion.`, typeAssertionNode);
+    }
   }
 
-  return termTypeAssertionVerified;
+  return standaloneTypeAssertionVerified;
 }

package/src/verify/variable.js

@@ -1,9 +1,10 @@
 "use strict";
 
 import Variable from "../variable";
+import VariableAssignment from "../assignment/variable";
 
 import { objectType } from "../type";
-import { typeNameFromTypeNode, variableNameFromVariableNode } from "../utilities/query";
+import { typeNameFromTypeNode } from "../utilities/query";
 
 export default function verifyVariable(variableNode, typeNode, fileContext) {
   let variableVerified = false;
@@ -12,37 +13,36 @@ export default function verifyVariable(variableNode, typeNode, fileContext) {
 
   fileContext.trace(`Verifying the '${variableString}' variable...`, variableNode);
 
-  const variableName = variableNameFromVariableNode(variableNode),
-        variablePresent = fileContext.isVariablePresentByVariableName(variableName);
+  const variablePresent = fileContext.isVariablePresentByVariableNode(variableNode);
 
   if (variablePresent) {
-    fileContext.debug(`The variable '${variableName}' is already present.`, variableNode);
+    fileContext.debug(`The variable '${variableString}' is already present.`, variableNode);
   } else {
     let variable;
 
     const typeName = typeNameFromTypeNode(typeNode);
     
     if (typeName === null) {
-      const name = variableName,  ///
-            type = objectType;
+      const type = objectType;
 
-        variable = Variable.fromNameAndType(name, type);
+      variable = Variable.fromVariableNodeAndType(variableNode, type);
     } else {
       const type = fileContext.findTypeByTypeName(typeName);
 
       if (type === null) {
-        fileContext.debug(`The '${variableName}' variable's '${typeName}' type is not present.`, variableNode);
+        fileContext.debug(`The '${variableString}' variable's '${typeName}' type is not present.`, variableNode);
       } else {
-        const name = variableName;  ///
-
-        variable = Variable.fromNameAndType(name, type);
+        variable = Variable.fromVariableNodeAndType(variableNode, type);
       }
     }
 
     if (variable !== null) {
-      fileContext.addVariable(variable);
+      const variableAssignment = VariableAssignment.fromVariable(variable),
+            variableAssigned = variableAssignment.assign(fileContext);
 
-      variableVerified = true;
+      if (variableAssigned) {
+        variableVerified = true;
+      }
     }
   }