occam-verify-cli 0.0.1023 → 0.0.1024

package/src/term.js

@@ -197,9 +197,12 @@ class Term {
 
     fileContext.trace(`Verifying the '${termString}' term at top level...`);
 
-    const termNode = this.node;  ///
+    const termNode = this.node,
+          termVerifiedAsConstructor = termAsConstructorVerifier.verifyTerm(termNode, fileContext);
 
-    verifiedAtTopLevel = termAsConstructorVerifier.verifyTerm(termNode, fileContext);
+    if (termVerifiedAsConstructor) {
+      verifiedAtTopLevel = true;
+    }
 
     if (verifiedAtTopLevel) {
       fileContext.debug(`...verified the '${termString}' term at top level.`, termNode);
@@ -223,25 +226,14 @@ class Term {
   }
 
   static fromJSON(json, fileContext) {
-    const { Type } = shim,
-          { string } = json,
+    const { string } = json,
           termString = string,  ///
           lexer = fileContext.getLexer(),
           parser = fileContext.getParser(),
           termNode = termNodeFromTermString(termString, lexer, parser),
-          node = termNode;
-
-    let { type } = json;
-
-    const typeJSON = type;  ///
-
-    json = typeJSON;  ///
-
-    type = (json !== null) ?
-             Type.fromJSON(json, fileContext) :
-               null;
-
-    const term = new Term(string, node, type);
+          node = termNode,  ///
+          type = typeFromJSON(json, fileContext),
+          term = new Term(string, node, type);
 
     return term;
   }
@@ -268,4 +260,15 @@ Object.assign(shim, {
   Term
 });
 
-export default Term;
+export default Term;
+
+function typeFromJSON(json, fileContext) {
+  let { type } = json;
+
+  const { name } = type,
+        typeName = name;  ///
+
+  type = fileContext.findTypeByTypeName(typeName);
+
+  return type;
+}

package/src/type.js

@@ -155,19 +155,17 @@ class Type {
     if (typePresent) {
       fileContext.debug(`The type '${typeString}' is already present.`);
     } else {
-      if (this.superType === null) {
-        verifiedAtTopLevel = true;
-      } else {
-        const name = this.superType.getName(),
-              superTypePresent = fileContext.isTypePresentByTypeName(name);
+      const superTypeName = this.superType.getName(),
+            superType = fileContext.isTypePresentByTypeName(superTypeName);
 
-        if (superTypePresent) {
-          verifiedAtTopLevel = true;
-        } else {
-          const superTypeString = this.superType.getString();
+      if (superType === null) {
+        const superTypeString = this.superType.getString();
 
-          fileContext.debug(`The super-type '${superTypeString}' is not present.`);
-        }
+        fileContext.debug(`The super-type '${superTypeString}' is not present.`);
+      } else {
+        this.superType = superType;
+
+        verifiedAtTopLevel = true;
       }
     }
 
@@ -193,24 +191,11 @@ class Type {
   }
 
   static fromJSON(json, fileContext) {
-    const { name } = json;
-
-    let { superType } = json;
-
-    const superTypeJSON = superType;  ///
-
-    json = superTypeJSON; ///
-
-    superType = (json !== null) ?
-                   Type.fromJSON(json, fileContext) :
-                      null;
-
-    const typeName = name,  ///
+    const { name } = json,
+          typeName = name,  ///
+          superType = superTypeFromJSON(json, fileContext),
           string = stringFromTypeNameAndSuperType(typeName, superType),
-          typeNameObjectTypeName = (typeName === OBJECT_TYPE_NAME),
-          type = typeNameObjectTypeName ?
-                   objectType :
-                     new Type(string, name, superType);
+          type = new Type(string, name, superType);
 
     return type;
   }
@@ -220,10 +205,7 @@ class Type {
           name = typeName,  ///
           string = name,  ///
           superType = null,
-          typeNameObjectTypeName = (typeName === OBJECT_TYPE_NAME),
-          type = typeNameObjectTypeName ?
-                   objectType :
-                     new Type(string, name, superType);
+          type = new Type(string, name, superType);
 
     return type;
   }
@@ -274,3 +256,19 @@ class ObjectType extends Type {
 }
 
 export const objectType = ObjectType.fromNothing();
+
+function superTypeFromJSON(json, fileContext) {
+  let { superType } = json;
+
+  const superTypeJSON = superType;  ///
+
+  json = superTypeJSON; ///
+
+  const { name } = json,
+        typeName = name,  ///
+        type = fileContext.findTypeByTypeName(typeName);
+
+  superType = type; ///
+
+  return superType;
+}

package/src/unify/metavariableWithStatement.js

@@ -3,7 +3,7 @@
 import StatementForMetavariableSubstitution from "../substitution/statementForMetavariable";
 
 import { metavariableFromStatementNode } from "../utilities/unify";
-import {metavariableNameFromMetavariableNode} from "../utilities/name";
+import { metavariableNameFromMetavariableNode } from "../utilities/name";
 
 export default function unifyMetavariableWithStatement(metavariableNodeA, statementNodeB, substitutions, localContextA, localContextB) {
   let metavariableUnifiedWithStatement = false;

package/src/unify/metavariableWithStatementGivenSubstitution.js

@@ -3,7 +3,7 @@
 import StatementForMetavariableSubstitution from "../substitution/statementForMetavariable";
 
 import { metavariableFromStatementNode } from "../utilities/unify";
-import {metavariableNameFromMetavariableNode} from "../utilities/name";
+import { metavariableNameFromMetavariableNode } from "../utilities/name";
 
 export default function unifyMetavariableWithStatementGivenSubstitution(metavariableNodeA, statementNodeB, substitutionNodeA, substitutions, localContextA, localContextB) {
   let metavariableUnifiedWithStatementGivenSubstitution = false;

package/src/utilities/array.js

@@ -2,7 +2,7 @@
 
 import { arrayUtilities } from "necessary";
 
-export const { first, second, last, extract, tail, push, find, match, prune, filter, compress, separate } = arrayUtilities;
+export const { first, last, extract, tail, push, find, clear, match, prune, filter, compress, separate } = arrayUtilities;
 
 export function reverse(array) {
   array = [ ///

package/src/utilities/unify.js

@@ -1,6 +1,7 @@
 "use strict";
 
 import { nodeQuery } from "../utilities/query";
+import { metavariableNameFromMetavariableNode}  from "../utilities/name";
 
 const termVariableNodeQuery = nodeQuery("/term/variable"),
       frameMetavariableNodeQuery = nodeQuery("/frame/metavariable"),
@@ -26,7 +27,8 @@ export function metavariableFromFrameNode(frameNode, localContext) {
   const frameMetavariableNode = frameMetavariableNodeQuery(frameNode)
 
   if (frameMetavariableNode !== null) {
-    const metavariableNode = frameMetavariableNode; ///
+    const metavariableNode = statementMetavariableNode, ///
+          metavariableName = metavariableNameFromMetavariableNode(metavariableNode);
 
     metavariable = localContext.findMetavariableByMetavariableName(metavariableName);
   }
@@ -40,7 +42,8 @@ export function metavariableFromStatementNode(statementNode, localContext) {
   const statementMetavariableNode = statementMetavariableNodeQuery(statementNode)
 
   if (statementMetavariableNode !== null) {
-    const metavariableNode = statementMetavariableNode; ///
+    const metavariableNode = statementMetavariableNode, ///
+          metavariableName = metavariableNameFromMetavariableNode(metavariableNode);
 
     metavariable = localContext.findMetavariableByMetavariableName(metavariableName);
   }

package/src/variable.js

@@ -89,22 +89,7 @@ export default class Variable {
     if (variablePresent) {
       localContext.debug(`The '${variableString}' variable is already present.`);
     } else {
-      const typeName = this.type.getName(),
-            type = localContext.findTypeByTypeName(typeName);
-
-      if (type === null) {
-        const typeString = this.type.getString();
-
-        localContext.debug(`The '${typeString}' type is not present.`);
-      } else {
-        this.type = type;
-
-        const variable = this;  ///
-
-        localContext.addVariable(variable);
-
-        verifiedAtTopLevel = true;
-      }
+      verifiedAtTopLevel = true;
     }
 
     if (verifiedAtTopLevel) {
@@ -129,24 +114,15 @@ export default class Variable {
   }
 
   static fromJSON(json, fileContext) {
-    const { Type } = shim,
-          { string } = json,
+    const { string } = json,
           lexer  = fileContext.getLexer(),
           parser = fileContext.getParser(),
           variableString = string,  ///
           variableNode = variableNodeFromVariableString(variableString, lexer, parser),
-          node = variableNode;  ///
-
-    let { type } = json;
-
-    if (type !== null) {
-      json = type;  ///
-
-      type = Type.fromJSON(json, fileContext);
-    }
-
-    const variableName = variableNameFromVariableNode(variableNode),
+          variableName = variableNameFromVariableNode(variableNode),
+          node = variableNode,
           name = variableName,  ///
+          type = typeFromJSON(json, fileContext),
           variable = new Variable(string, node, name, type);
 
     return variable;
@@ -191,3 +167,14 @@ export default class Variable {
     return variable;
   }
 }
+
+function typeFromJSON(json, fileContext) {
+  let { type } = json;
+
+  const { name } = type,
+        typeName = name;  ///
+
+  type = fileContext.findTypeByTypeName(typeName);
+
+  return type;
+}

package/lib/verify/files.js

@@ -1,56 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return verifyFiles;
-    }
-});
-var _file = /*#__PURE__*/ _interop_require_default(require("../verify/file"));
-var _occamentities = require("occam-entities");
-var _array = require("../utilities/array");
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-var isFilePathNominalFilePath = _occamentities.filePathUtilities.isFilePathNominalFilePath;
-function verifyFiles(releaseContext) {
-    var _loop = function() {
-        var filePathsLength = filePaths.length;
-        if (filePathsLength === 0) {
-            filesVerified = true;
-            return "break";
-        }
-        var verifiedFilePaths = [];
-        filePaths.forEach(function(filePath) {
-            var fileVerified = (0, _file.default)(filePath, releaseContext);
-            if (fileVerified) {
-                var verifiedFilePath = filePath; ///
-                verifiedFilePaths.push(verifiedFilePath);
-            }
-        });
-        var verifiedFilePathsLength = verifiedFilePaths.length, fileVerified = verifiedFilePathsLength > 0;
-        if (!fileVerified) {
-            return "break";
-        }
-        (0, _array.leftDifference)(filePaths, verifiedFilePaths);
-    };
-    var filesVerified = false;
-    var filePaths = releaseContext.getFilePaths();
-    (0, _array.filter)(filePaths, function(filePath) {
-        var filePathNominalFilePath = isFilePathNominalFilePath(filePath);
-        if (filePathNominalFilePath) {
-            return true;
-        }
-    });
-    for(;;){
-        var _ret = _loop();
-        if (_ret === "break") break;
-    }
-    return filesVerified;
-}
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvZmlsZXMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB2ZXJpZnlGaWxlIGZyb20gXCIuLi92ZXJpZnkvZmlsZVwiO1xuXG5pbXBvcnQgeyBmaWxlUGF0aFV0aWxpdGllcyB9IGZyb20gXCJvY2NhbS1lbnRpdGllc1wiO1xuXG5pbXBvcnQgeyBmaWx0ZXIsIGxlZnREaWZmZXJlbmNlIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9hcnJheVwiO1xuXG5jb25zdCB7IGlzRmlsZVBhdGhOb21pbmFsRmlsZVBhdGggfSA9IGZpbGVQYXRoVXRpbGl0aWVzO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlGaWxlcyhyZWxlYXNlQ29udGV4dCkge1xuICBsZXQgZmlsZXNWZXJpZmllZCA9IGZhbHNlO1xuXG4gIGNvbnN0IGZpbGVQYXRocyA9IHJlbGVhc2VDb250ZXh0LmdldEZpbGVQYXRocygpO1xuXG4gIGZpbHRlcihmaWxlUGF0aHMsIChmaWxlUGF0aCkgPT4ge1xuICAgIGNvbnN0IGZpbGVQYXRoTm9taW5hbEZpbGVQYXRoID0gaXNGaWxlUGF0aE5vbWluYWxGaWxlUGF0aChmaWxlUGF0aCk7XG5cbiAgICBpZiAoZmlsZVBhdGhOb21pbmFsRmlsZVBhdGgpIHtcbiAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cbiAgfSk7XG5cbiAgZm9yICg7Oykge1xuICAgIGNvbnN0IGZpbGVQYXRoc0xlbmd0aCA9IGZpbGVQYXRocy5sZW5ndGg7XG5cbiAgICBpZiAoZmlsZVBhdGhzTGVuZ3RoID09PSAwKSB7XG4gICAgICBmaWxlc1ZlcmlmaWVkID0gdHJ1ZTtcblxuICAgICAgYnJlYWs7XG4gICAgfVxuXG4gICAgY29uc3QgdmVyaWZpZWRGaWxlUGF0aHMgPSBbXTtcblxuICAgIGZpbGVQYXRocy5mb3JFYWNoKChmaWxlUGF0aCkgPT4ge1xuICAgICAgY29uc3QgZmlsZVZlcmlmaWVkID0gdmVyaWZ5RmlsZShmaWxlUGF0aCwgcmVsZWFzZUNvbnRleHQpO1xuXG4gICAgICBpZiAoZmlsZVZlcmlmaWVkKSB7XG4gICAgICAgIGNvbnN0IHZlcmlmaWVkRmlsZVBhdGggPSBmaWxlUGF0aDsgIC8vL1xuXG4gICAgICAgIHZlcmlmaWVkRmlsZVBhdGhzLnB1c2godmVyaWZpZWRGaWxlUGF0aCk7XG4gICAgICB9XG4gICAgfSk7XG5cbiAgICBjb25zdCB2ZXJpZmllZEZpbGVQYXRoc0xlbmd0aCA9IHZlcmlmaWVkRmlsZVBhdGhzLmxlbmd0aCxcbiAgICAgICAgICBmaWxlVmVyaWZpZWQgPSAodmVyaWZpZWRGaWxlUGF0aHNMZW5ndGggPiAwKTtcblxuICAgIGlmICghZmlsZVZlcmlmaWVkKSB7XG4gICAgICBicmVhaztcbiAgICB9XG5cbiAgICBsZWZ0RGlmZmVyZW5jZShmaWxlUGF0aHMsIHZlcmlmaWVkRmlsZVBhdGhzKTtcbiAgfVxuXG4gIHJldHVybiBmaWxlc1ZlcmlmaWVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeUZpbGVzIiwiaXNGaWxlUGF0aE5vbWluYWxGaWxlUGF0aCIsImZpbGVQYXRoVXRpbGl0aWVzIiwicmVsZWFzZUNvbnRleHQiLCJmaWxlUGF0aHNMZW5ndGgiLCJmaWxlUGF0aHMiLCJsZW5ndGgiLCJmaWxlc1ZlcmlmaWVkIiwidmVyaWZpZWRGaWxlUGF0aHMiLCJmb3JFYWNoIiwiZmlsZVBhdGgiLCJmaWxlVmVyaWZpZWQiLCJ2ZXJpZnlGaWxlIiwidmVyaWZpZWRGaWxlUGF0aCIsInB1c2giLCJ2ZXJpZmllZEZpbGVQYXRoc0xlbmd0aCIsImxlZnREaWZmZXJlbmNlIiwiZ2V0RmlsZVBhdGhzIiwiZmlsdGVyIiwiZmlsZVBhdGhOb21pbmFsRmlsZVBhdGgiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVVBOzs7ZUFBd0JBOzs7MkRBUkQ7NkJBRVc7cUJBRUs7Ozs7OztBQUV2QyxJQUFNLEFBQUVDLDRCQUE4QkMsZ0NBQWlCLENBQS9DRDtBQUVPLFNBQVNELFlBQVlHLGNBQWM7O1FBYzlDLElBQU1DLGtCQUFrQkMsVUFBVUMsTUFBTTtRQUV4QyxJQUFJRixvQkFBb0IsR0FBRztZQUN6QkcsZ0JBQWdCO1lBRWhCLE9BQUE7UUFDRjtRQUVBLElBQU1DLG9CQUFvQixFQUFFO1FBRTVCSCxVQUFVSSxPQUFPLENBQUMsU0FBQ0M7WUFDakIsSUFBTUMsZUFBZUMsSUFBQUEsYUFBVSxFQUFDRixVQUFVUDtZQUUxQyxJQUFJUSxjQUFjO2dCQUNoQixJQUFNRSxtQkFBbUJILFVBQVcsR0FBRztnQkFFdkNGLGtCQUFrQk0sSUFBSSxDQUFDRDtZQUN6QjtRQUNGO1FBRUEsSUFBTUUsMEJBQTBCUCxrQkFBa0JGLE1BQU0sRUFDbERLLGVBQWdCSSwwQkFBMEI7UUFFaEQsSUFBSSxDQUFDSixjQUFjO1lBQ2pCLE9BQUE7UUFDRjtRQUVBSyxJQUFBQSxxQkFBYyxFQUFDWCxXQUFXRztJQUM1QjtJQXpDQSxJQUFJRCxnQkFBZ0I7SUFFcEIsSUFBTUYsWUFBWUYsZUFBZWMsWUFBWTtJQUU3Q0MsSUFBQUEsYUFBTSxFQUFDYixXQUFXLFNBQUNLO1FBQ2pCLElBQU1TLDBCQUEwQmxCLDBCQUEwQlM7UUFFMUQsSUFBSVMseUJBQXlCO1lBQzNCLE9BQU87UUFDVDtJQUNGO0lBRUE7Ozs7SUErQkEsT0FBT1o7QUFDVCJ9

package/src/verify/files.js

@@ -1,56 +0,0 @@
-"use strict";
-
-import verifyFile from "../verify/file";
-
-import { filePathUtilities } from "occam-entities";
-
-import { filter, leftDifference } from "../utilities/array";
-
-const { isFilePathNominalFilePath } = filePathUtilities;
-
-export default function verifyFiles(releaseContext) {
-  let filesVerified = false;
-
-  const filePaths = releaseContext.getFilePaths();
-
-  filter(filePaths, (filePath) => {
-    const filePathNominalFilePath = isFilePathNominalFilePath(filePath);
-
-    if (filePathNominalFilePath) {
-      return true;
-    }
-  });
-
-  for (;;) {
-    const filePathsLength = filePaths.length;
-
-    if (filePathsLength === 0) {
-      filesVerified = true;
-
-      break;
-    }
-
-    const verifiedFilePaths = [];
-
-    filePaths.forEach((filePath) => {
-      const fileVerified = verifyFile(filePath, releaseContext);
-
-      if (fileVerified) {
-        const verifiedFilePath = filePath;  ///
-
-        verifiedFilePaths.push(verifiedFilePath);
-      }
-    });
-
-    const verifiedFilePathsLength = verifiedFilePaths.length,
-          fileVerified = (verifiedFilePathsLength > 0);
-
-    if (!fileVerified) {
-      break;
-    }
-
-    leftDifference(filePaths, verifiedFilePaths);
-  }
-
-  return filesVerified;
-}