occam-verify-cli 0.0.1028 → 0.0.1030

package/lib/type.js

@@ -211,31 +211,6 @@ var Type = /*#__PURE__*/ function() {
                 return typeNodeMatches;
             }
         },
-        {
-            key: "verify",
-            value: function verify(fileContext) {
-                var verified = false;
-                var typeString = this.string; ///
-                fileContext.trace("Verifying the '".concat(typeString, "' type..."));
-                var typePresent = fileContext.isTypePresentByTypeName(this.name);
-                if (typePresent) {
-                    var superTypeName = this.superType.getName(), superType = fileContext.findTypeByTypeName(superTypeName);
-                    if (superType === null) {
-                        var superTypeString = this.superType.asString();
-                        fileContext.debug("The '".concat(superTypeString, "' super-type is not present."));
-                    } else {
-                        this.superType = superType;
-                        verified = true;
-                    }
-                } else {
-                    fileContext.debug("The '".concat(typeString, "' type is not present."));
-                }
-                if (verified) {
-                    fileContext.debug("...verified the '".concat(typeString, "' type."));
-                }
-                return verified;
-            }
-        },
         {
             key: "verifyAtTopLevel",
             value: function verifyAtTopLevel(fileContext) {
@@ -246,7 +221,7 @@ var Type = /*#__PURE__*/ function() {
                 if (typePresent) {
                     fileContext.debug("The type '".concat(typeString, "' is already present."));
                 } else {
-                    var superTypeName = this.superType.getName(), superType = fileContext.isTypePresentByTypeName(superTypeName);
+                    var superTypeName = this.superType.getName(), superType = fileContext.findTypeByTypeName(superTypeName);
                     if (superType === null) {
                         var superTypeString = this.superType.getString();
                         fileContext.debug("The super-type '".concat(superTypeString, "' is not present."));
@@ -305,8 +280,10 @@ var Type = /*#__PURE__*/ function() {
 function stringFromTypeNameAndSuperType(typeName, superType) {
     var string = typeName; ///
     if (superType !== null) {
-        var typeString = string, superTypeString = superType.getString();
-        string = "".concat(typeString, ":").concat(superTypeString);
+        if (superType !== objectType) {
+            var typeString = string, superTypeName = superType.getName();
+            string = "".concat(typeString, ":").concat(superTypeName);
+        }
     }
     return string;
 }
@@ -341,4 +318,4 @@ function superTypeFromJSON(json, fileContext) {
     return superType;
 }
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/type.js"],"sourcesContent":["\"use strict\";\n\nimport shim from \"./shim\";\n\nimport { nodeQuery } from \"./utilities/query\";\nimport { OBJECT_TYPE_NAME } from \"./typeNames\";\nimport { typeNameFromTypeNode } from \"./utilities/name\";\n\nconst typeNodeQuery = nodeQuery(\"/typeDeclaration/type[0]\"),\n      superTypeNodeQuery = nodeQuery(\"/typeDeclaration/type[1]\");\n\nclass Type {\n  constructor(string, name, superType) {\n    this.string = string;\n    this.name = name;\n    this.superType = superType;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getName() {\n    return this.name;\n  }\n\n  getSuperType() {\n    return this.superType;\n  }\n\n  isEqualTo(type) {\n    const equalTo = (this === type);\n\n    return equalTo;\n  }\n\n  isSubTypeOf(type) {\n    let subTypeOf = false;\n\n    let superType = this.superType;\n\n    while (superType !== null) {\n      if (superType === type) {\n        subTypeOf = true;\n\n        break;\n      }\n\n      superType = superType.getSuperType();\n    }\n\n    return subTypeOf;\n  }\n\n  isSuperTypeOf(type) {\n    let superTypeOf = false;\n\n    let superType = type.getSuperType();\n\n    while (superType !== null) {\n      if (superType === this) {\n        superTypeOf = true;\n\n        break;\n      }\n\n      superType = superType.getSuperType();\n    }\n\n    return superTypeOf;\n  }\n\n  isComparableTo(type) {\n    const equalTo = this.isEqualTo(type),\n          subTypeOf = this.isSubTypeOf(type),\n          superTypeOf = this.isSuperTypeOf(type),\n          comparableTo = (equalTo || subTypeOf || superTypeOf);\n\n    return comparableTo;\n  }\n\n  isEqualToOrSubTypeOf(type) {\n    const equalTo = this.isEqualTo(type),\n          subTypeOf = this.isSubTypeOf(type),\n          equalToOrSubTypeOf = (equalTo || subTypeOf);\n\n    return equalToOrSubTypeOf;\n  }\n\n  isEqualToOrSuperTypeOf(type) {\n    const equalTo = this.isEqualTo(type),\n          superTypeOf = this.isSuperTypeOf(type),\n          equalToOrSuperTypeOf = (equalTo || superTypeOf);\n\n    return equalToOrSuperTypeOf;\n  }\n\n  match(type) {\n    const matches = (type === this);  ///\n\n    return matches;\n  }\n\n  matchName(name) {\n    const nodeMatches = (this.name === name);\n\n    return nodeMatches;\n  }\n\n  matchTypeName(typeName) {\n    const typeNameMatches = (this.name === typeName);\n\n    return typeNameMatches;\n  }\n\n  matchTypeNode(typeNode) {\n    const typeName = typeNameFromTypeNode(typeNode),\n          typeNameMatches = this.matchTypeName(typeName),\n          typeNodeMatches = typeNameMatches;  ///\n\n    return typeNodeMatches;\n  }\n\n  verify(fileContext) {\n    let verified = false;\n\n    const typeString = this.string; ///\n\n    fileContext.trace(`Verifying the '${typeString}' type...`);\n\n    const typePresent = fileContext.isTypePresentByTypeName(this.name);\n\n    if (typePresent) {\n      const superTypeName = this.superType.getName(),\n            superType = fileContext.findTypeByTypeName(superTypeName);\n\n      if (superType === null) {\n        const superTypeString = this.superType.asString();\n\n        fileContext.debug(`The '${superTypeString}' super-type is not present.`);\n      } else {\n        this.superType = superType;\n\n        verified = true;\n      }\n    } else {\n      fileContext.debug(`The '${typeString}' type is not present.`);\n    }\n\n    if (verified) {\n      fileContext.debug(`...verified the '${typeString}' type.`);\n    }\n\n    return verified;\n  }\n\n  verifyAtTopLevel(fileContext) {\n    let verifiedAtTopLevel = false;\n\n    const typeString = this.string; ///\n\n    fileContext.trace(`Verifying the '${typeString}' type at top level...`);\n\n    const typePresent = fileContext.isTypePresentByTypeName(this.name);\n\n    if (typePresent) {\n      fileContext.debug(`The type '${typeString}' is already present.`);\n    } else {\n      const superTypeName = this.superType.getName(),\n            superType = fileContext.isTypePresentByTypeName(superTypeName);\n\n      if (superType === null) {\n        const superTypeString = this.superType.getString();\n\n        fileContext.debug(`The super-type '${superTypeString}' is not present.`);\n      } else {\n        this.superType = superType;\n\n        verifiedAtTopLevel = true;\n      }\n    }\n\n    if (verifiedAtTopLevel) {\n      fileContext.debug(`...verified the '${typeString}' type at top level.`);\n    }\n\n    return verifiedAtTopLevel;\n  }\n\n  toJSON() {\n    const superTypeJSON = this.superType.toJSON(),\n          name = this.name,\n          superType = superTypeJSON,  ///\n          json = {\n            name,\n            superType\n          };\n\n    return json;\n  }\n\n  static fromJSON(json, fileContext) {\n    const { name } = json,\n          typeName = name,  ///\n          superType = superTypeFromJSON(json, fileContext),\n          string = stringFromTypeNameAndSuperType(typeName, superType),\n          type = new Type(string, name, superType);\n\n    return type;\n  }\n\n  static fromTypeNode(typeNode) {\n    let type;\n\n    if (typeNode === null) {\n      type = objectType;\n    } else {\n      const typeName = typeNameFromTypeNode(typeNode),\n            name = typeName,  ///\n            string = name,  ///\n            superType = null;\n\n      type = new Type(string, name, superType);\n    }\n\n    return type;\n  }\n\n  static fromTypeDeclarationNode(typeDeclarationNode, fileContext) {\n    const typeNode = typeNodeQuery(typeDeclarationNode),\n          superTypeNode = superTypeNodeQuery(typeDeclarationNode),\n          typeName = typeNameFromTypeNode(typeNode),\n          superType = Type.fromTypeNode(superTypeNode),\n          string = stringFromTypeNameAndSuperType(typeName, superType),\n          name = typeName,  ///\n          type = new Type(string, name, superType);\n\n    return type;\n  }\n}\n\nfunction stringFromTypeNameAndSuperType(typeName, superType) {\n  let string = typeName;  ///\n\n  if (superType !== null) {\n    const typeString = string,  ///\n          superTypeString = superType.getString();\n\n    string = `${typeString}:${superTypeString}`;\n  }\n\n  return string;\n}\n\nObject.assign(shim, {\n  Type\n});\n\nexport default Type;\n\nclass ObjectType extends Type {\n  static fromNothing() {\n    const name = OBJECT_TYPE_NAME,\n          string = name,  //\n          superType = null,\n          objectType = new ObjectType(string, name, superType);\n\n    return objectType;\n  }\n}\n\nexport const objectType = ObjectType.fromNothing();\n\nfunction superTypeFromJSON(json, fileContext) {\n  let { superType } = json;\n\n  const superTypeJSON = superType;  ///\n\n  json = superTypeJSON; ///\n\n  const { name } = json,\n        typeName = name,  ///\n        type = fileContext.findTypeByTypeName(typeName);\n\n  superType = type; ///\n\n  return superType;\n}\n"],"names":["objectType","typeNodeQuery","nodeQuery","superTypeNodeQuery","Type","string","name","superType","getString","getName","getSuperType","isEqualTo","type","equalTo","isSubTypeOf","subTypeOf","isSuperTypeOf","superTypeOf","isComparableTo","comparableTo","isEqualToOrSubTypeOf","equalToOrSubTypeOf","isEqualToOrSuperTypeOf","equalToOrSuperTypeOf","match","matches","matchName","nodeMatches","matchTypeName","typeName","typeNameMatches","matchTypeNode","typeNode","typeNameFromTypeNode","typeNodeMatches","verify","fileContext","verified","typeString","trace","typePresent","isTypePresentByTypeName","superTypeName","findTypeByTypeName","superTypeString","asString","debug","verifyAtTopLevel","verifiedAtTopLevel","toJSON","superTypeJSON","json","fromJSON","superTypeFromJSON","stringFromTypeNameAndSuperType","fromTypeNode","fromTypeDeclarationNode","typeDeclarationNode","superTypeNode","Object","assign","shim","ObjectType","fromNothing","OBJECT_TYPE_NAME"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/type.js"],"sourcesContent":["\"use strict\";\n\nimport shim from \"./shim\";\n\nimport { nodeQuery } from \"./utilities/query\";\nimport { OBJECT_TYPE_NAME } from \"./typeNames\";\nimport { typeNameFromTypeNode } from \"./utilities/name\";\n\nconst typeNodeQuery = nodeQuery(\"/typeDeclaration/type[0]\"),\n      superTypeNodeQuery = nodeQuery(\"/typeDeclaration/type[1]\");\n\nclass Type {\n  constructor(string, name, superType) {\n    this.string = string;\n    this.name = name;\n    this.superType = superType;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getName() {\n    return this.name;\n  }\n\n  getSuperType() {\n    return this.superType;\n  }\n\n  isEqualTo(type) {\n    const equalTo = (this === type);\n\n    return equalTo;\n  }\n\n  isSubTypeOf(type) {\n    let subTypeOf = false;\n\n    let superType = this.superType;\n\n    while (superType !== null) {\n      if (superType === type) {\n        subTypeOf = true;\n\n        break;\n      }\n\n      superType = superType.getSuperType();\n    }\n\n    return subTypeOf;\n  }\n\n  isSuperTypeOf(type) {\n    let superTypeOf = false;\n\n    let superType = type.getSuperType();\n\n    while (superType !== null) {\n      if (superType === this) {\n        superTypeOf = true;\n\n        break;\n      }\n\n      superType = superType.getSuperType();\n    }\n\n    return superTypeOf;\n  }\n\n  isComparableTo(type) {\n    const equalTo = this.isEqualTo(type),\n          subTypeOf = this.isSubTypeOf(type),\n          superTypeOf = this.isSuperTypeOf(type),\n          comparableTo = (equalTo || subTypeOf || superTypeOf);\n\n    return comparableTo;\n  }\n\n  isEqualToOrSubTypeOf(type) {\n    const equalTo = this.isEqualTo(type),\n          subTypeOf = this.isSubTypeOf(type),\n          equalToOrSubTypeOf = (equalTo || subTypeOf);\n\n    return equalToOrSubTypeOf;\n  }\n\n  isEqualToOrSuperTypeOf(type) {\n    const equalTo = this.isEqualTo(type),\n          superTypeOf = this.isSuperTypeOf(type),\n          equalToOrSuperTypeOf = (equalTo || superTypeOf);\n\n    return equalToOrSuperTypeOf;\n  }\n\n  match(type) {\n    const matches = (type === this);  ///\n\n    return matches;\n  }\n\n  matchName(name) {\n    const nodeMatches = (this.name === name);\n\n    return nodeMatches;\n  }\n\n  matchTypeName(typeName) {\n    const typeNameMatches = (this.name === typeName);\n\n    return typeNameMatches;\n  }\n\n  matchTypeNode(typeNode) {\n    const typeName = typeNameFromTypeNode(typeNode),\n          typeNameMatches = this.matchTypeName(typeName),\n          typeNodeMatches = typeNameMatches;  ///\n\n    return typeNodeMatches;\n  }\n\n  verifyAtTopLevel(fileContext) {\n    let verifiedAtTopLevel = false;\n\n    const typeString = this.string; ///\n\n    fileContext.trace(`Verifying the '${typeString}' type at top level...`);\n\n    const typePresent = fileContext.isTypePresentByTypeName(this.name);\n\n    if (typePresent) {\n      fileContext.debug(`The type '${typeString}' is already present.`);\n    } else {\n      const superTypeName = this.superType.getName(),\n            superType = fileContext.findTypeByTypeName(superTypeName);\n\n      if (superType === null) {\n        const superTypeString = this.superType.getString();\n\n        fileContext.debug(`The super-type '${superTypeString}' is not present.`);\n      } else {\n        this.superType = superType;\n\n        verifiedAtTopLevel = true;\n      }\n    }\n\n    if (verifiedAtTopLevel) {\n      fileContext.debug(`...verified the '${typeString}' type at top level.`);\n    }\n\n    return verifiedAtTopLevel;\n  }\n\n  toJSON() {\n    const superTypeJSON = this.superType.toJSON(),\n          name = this.name,\n          superType = superTypeJSON,  ///\n          json = {\n            name,\n            superType\n          };\n\n    return json;\n  }\n\n  static fromJSON(json, fileContext) {\n    const { name } = json,\n          typeName = name,  ///\n          superType = superTypeFromJSON(json, fileContext),\n          string = stringFromTypeNameAndSuperType(typeName, superType),\n          type = new Type(string, name, superType);\n\n    return type;\n  }\n\n  static fromTypeNode(typeNode) {\n    let type;\n\n    if (typeNode === null) {\n      type = objectType;\n    } else {\n      const typeName = typeNameFromTypeNode(typeNode),\n            name = typeName,  ///\n            string = name,  ///\n            superType = null;\n\n      type = new Type(string, name, superType);\n    }\n\n    return type;\n  }\n\n  static fromTypeDeclarationNode(typeDeclarationNode, fileContext) {\n    const typeNode = typeNodeQuery(typeDeclarationNode),\n          superTypeNode = superTypeNodeQuery(typeDeclarationNode),\n          typeName = typeNameFromTypeNode(typeNode),\n          superType = Type.fromTypeNode(superTypeNode),\n          string = stringFromTypeNameAndSuperType(typeName, superType),\n          name = typeName,  ///\n          type = new Type(string, name, superType);\n\n    return type;\n  }\n}\n\nfunction stringFromTypeNameAndSuperType(typeName, superType) {\n  let string = typeName;  ///\n\n  if (superType !== null) {\n    if (superType !== objectType) {\n      const typeString = string,  ///\n            superTypeName = superType.getName();\n\n      string = `${typeString}:${superTypeName}`;\n    }\n  }\n\n  return string;\n}\n\nObject.assign(shim, {\n  Type\n});\n\nexport default Type;\n\nclass ObjectType extends Type {\n  static fromNothing() {\n    const name = OBJECT_TYPE_NAME,\n          string = name,  //\n          superType = null,\n          objectType = new ObjectType(string, name, superType);\n\n    return objectType;\n  }\n}\n\nexport const objectType = ObjectType.fromNothing();\n\nfunction superTypeFromJSON(json, fileContext) {\n  let { superType } = json;\n\n  const superTypeJSON = superType;  ///\n\n  json = superTypeJSON; ///\n\n  const { name } = json,\n        typeName = name,  ///\n        type = fileContext.findTypeByTypeName(typeName);\n\n  superType = type; ///\n\n  return superType;\n}\n"],"names":["objectType","typeNodeQuery","nodeQuery","superTypeNodeQuery","Type","string","name","superType","getString","getName","getSuperType","isEqualTo","type","equalTo","isSubTypeOf","subTypeOf","isSuperTypeOf","superTypeOf","isComparableTo","comparableTo","isEqualToOrSubTypeOf","equalToOrSubTypeOf","isEqualToOrSuperTypeOf","equalToOrSuperTypeOf","match","matches","matchName","nodeMatches","matchTypeName","typeName","typeNameMatches","matchTypeNode","typeNode","typeNameFromTypeNode","typeNodeMatches","verifyAtTopLevel","fileContext","verifiedAtTopLevel","typeString","trace","typePresent","isTypePresentByTypeName","debug","superTypeName","findTypeByTypeName","superTypeString","toJSON","superTypeJSON","json","fromJSON","superTypeFromJSON","stringFromTypeNameAndSuperType","fromTypeNode","fromTypeDeclarationNode","typeDeclarationNode","superTypeNode","Object","assign","shim","ObjectType","fromNothing","OBJECT_TYPE_NAME"],"mappings":"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"}

package/package.json

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

package/src/type.js

@@ -121,39 +121,6 @@ class Type {
     return typeNodeMatches;
   }
 
-  verify(fileContext) {
-    let verified = false;
-
-    const typeString = this.string; ///
-
-    fileContext.trace(`Verifying the '${typeString}' type...`);
-
-    const typePresent = fileContext.isTypePresentByTypeName(this.name);
-
-    if (typePresent) {
-      const superTypeName = this.superType.getName(),
-            superType = fileContext.findTypeByTypeName(superTypeName);
-
-      if (superType === null) {
-        const superTypeString = this.superType.asString();
-
-        fileContext.debug(`The '${superTypeString}' super-type is not present.`);
-      } else {
-        this.superType = superType;
-
-        verified = true;
-      }
-    } else {
-      fileContext.debug(`The '${typeString}' type is not present.`);
-    }
-
-    if (verified) {
-      fileContext.debug(`...verified the '${typeString}' type.`);
-    }
-
-    return verified;
-  }
-
   verifyAtTopLevel(fileContext) {
     let verifiedAtTopLevel = false;
 
@@ -167,7 +134,7 @@ class Type {
       fileContext.debug(`The type '${typeString}' is already present.`);
     } else {
       const superTypeName = this.superType.getName(),
-            superType = fileContext.isTypePresentByTypeName(superTypeName);
+            superType = fileContext.findTypeByTypeName(superTypeName);
 
       if (superType === null) {
         const superTypeString = this.superType.getString();
@@ -243,10 +210,12 @@ function stringFromTypeNameAndSuperType(typeName, superType) {
   let string = typeName;  ///
 
   if (superType !== null) {
-    const typeString = string,  ///
-          superTypeString = superType.getString();
+    if (superType !== objectType) {
+      const typeString = string,  ///
+            superTypeName = superType.getName();
 
-    string = `${typeString}:${superTypeString}`;
+      string = `${typeString}:${superTypeName}`;
+    }
   }
 
   return string;