occam-verify-cli 1.0.46 → 1.0.48

package/lib/dom/declaration/complexType.js

@@ -122,16 +122,16 @@ var _default = (0, _dom.domAssigned)((_ComplexTypeDeclaration = /*#__PURE__*/ fu
                 if (typeVerified) {
                     var superTypesVerified = this.verifySuperTypes();
                     if (superTypesVerified) {
+                        var superTypes;
+                        superTypes = this.type.getSuperTypes();
+                        superTypes = superTypes.map(function(superType) {
+                            var superTypeName = superType.getName();
+                            superType = _this.fileContext.findTypeByTypeName(superTypeName);
+                            return superType;
+                        });
+                        this.type.setSuperTypes(superTypes);
                         var includeSuperTypes = false, properties = this.type.getProperties(includeSuperTypes), propertiesVerified = this.verifyProperties(properties);
                         if (propertiesVerified) {
-                            var superTypes;
-                            superTypes = this.type.getSuperTypes();
-                            superTypes = superTypes.map(function(superType) {
-                                var superTypeName = superType.getName();
-                                superType = _this.fileContext.findTypeByTypeName(superTypeName);
-                                return superType;
-                            });
-                            this.type.setSuperTypes(superTypes);
                             this.fileContext.addType(this.type);
                             verified = true;
                         }
@@ -254,17 +254,22 @@ var _default = (0, _dom.domAssigned)((_ComplexTypeDeclaration = /*#__PURE__*/ fu
                 if (propertyType === _type.objectType) {
                     propertyTypeVerified = true;
                 } else {
-                    var propertyTypeString = propertyType.getString(); ///
-                    this.fileContext.trace("Verifying the '".concat(propertyTypeString, "' property type..."));
-                    var propertyTypeName = propertyType.getName(), propertyTypePresent = this.fileContext.isTypePresentByTypeName(propertyTypeName);
-                    if (!propertyTypePresent) {
-                        var propertyTypeString1 = propertyType.getString();
-                        this.fileContext.debug("The '".concat(propertyTypeString1, "' property type is not present."));
-                    } else {
+                    var typeName = this.type.getName(), propertyTypeName = propertyType.getName();
+                    if (typeName === propertyTypeName) {
                         propertyTypeVerified = true;
-                    }
-                    if (propertyTypeVerified) {
-                        this.fileContext.debug("...verified the '".concat(propertyTypeString, "' property type."));
+                    } else {
+                        var propertyTypeString = propertyType.getString(); ///
+                        this.fileContext.trace("Verifying the '".concat(propertyTypeString, "' property type..."));
+                        var propertyTypePresent = this.fileContext.isTypePresentByTypeName(propertyTypeName);
+                        if (!propertyTypePresent) {
+                            var propertyTypeString1 = propertyType.getString();
+                            this.fileContext.debug("The '".concat(propertyTypeString1, "' property type is not present."));
+                        } else {
+                            propertyTypeVerified = true;
+                        }
+                        if (propertyTypeVerified) {
+                            this.fileContext.debug("...verified the '".concat(propertyTypeString, "' property type."));
+                        }
                     }
                 }
                 return propertyTypeVerified;
@@ -282,4 +287,4 @@ var _default = (0, _dom.domAssigned)((_ComplexTypeDeclaration = /*#__PURE__*/ fu
     return ComplexTypeDeclaration;
 }(), _define_property(_ComplexTypeDeclaration, "name", "ComplexTypeDeclaration"), _ComplexTypeDeclaration));
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/dom/declaration/complexType.js"],"sourcesContent":["\"use strict\";\n\nimport dom from \"../../dom\";\n\nimport { objectType } from \"../type\";\nimport { domAssigned } from \"../../dom\";\nimport { superTypesStringFromSuperTypes } from \"../declaration/type\";\n\nexport default domAssigned(class ComplexTypeDeclaration {\n  constructor(fileContext, string, type) {\n    this.fileContext = fileContext;\n    this.string = string;\n    this.type = type;\n  }\n\n  getFileContext() {\n    return this.fileContext;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getType() {\n    return this.type;\n  }\n\n  verify() {\n    let verified = false;\n\n    const complexTypeDeclarationString = this.getString();\n\n    this.fileContext.trace(`Verifying the '${complexTypeDeclarationString}' complex type declaration...`);\n\n    const typeVerified = this.verifyType();\n\n    if (typeVerified) {\n      const superTypesVerified = this.verifySuperTypes();\n\n      if (superTypesVerified) {\n        const includeSuperTypes = false,\n              properties = this.type.getProperties(includeSuperTypes),\n              propertiesVerified = this.verifyProperties(properties);\n\n        if (propertiesVerified) {\n          let superTypes;\n\n          superTypes = this.type.getSuperTypes();\n\n          superTypes = superTypes.map((superType) => {\n            const superTypeName = superType.getName();\n\n            superType = this.fileContext.findTypeByTypeName(superTypeName);\n\n            return superType;\n          });\n\n          this.type.setSuperTypes(superTypes);\n\n          this.fileContext.addType(this.type);\n\n          verified = true;\n        }\n      }\n    }\n\n    if (verified) {\n      this.fileContext.debug(`...verified the '${complexTypeDeclarationString}' complex type declaration.`);\n    }\n\n    return verified;\n  }\n\n  verifyType() {\n    let typeVerified = false;\n\n    const typeName = this.type.getName();\n\n    this.fileContext.trace(`Verifying the '${typeName}' type...`);\n\n    const typePresent = this.fileContext.isTypePresentByTypeName(typeName);\n\n    if (typePresent) {\n      this.fileContext.debug(`The type '${typeName}' is already present.`);\n    } else {\n      typeVerified = true;\n    }\n\n    if (typeVerified) {\n      this.fileContext.debug(`...verified the '${typeName}' type.`);\n    }\n\n    return typeVerified;\n  }\n\n  verifyProperty(property, properties, superTypeProperties) {\n    let propertyVerified = false;\n\n    const propertyString = property.getString();\n\n    this.fileContext.trace(`Verifying the '${propertyString}' property...`);\n\n    const propertyNames = property.getNames(),\n          count = properties.reduce((count, property) => {\n            const propertyNamesMatch = property.matchPropertyNames(propertyNames);\n\n            if (propertyNamesMatch) {\n              count++;\n            }\n\n            return count;\n          }, 0);\n\n    if (count > 1) {\n      this.fileContext.debug(`The '${propertyString}' property appears more than once.`);\n    } else {\n      const superTypeProperty = superTypeProperties.find((superTypeProperty) => {\n        const propertyNameMatches = superTypeProperty.matchPropertyNames(propertyNames);\n\n        if (propertyNameMatches) {\n          return true;\n        }\n      }) || null;\n\n      if (superTypeProperty !== null) {\n        const superTypePropertyString = superTypeProperty.getString();\n\n        this.fileContext.debug(`The '${propertyString}' property matches the super type's '${superTypePropertyString}' property.`);\n      } else {\n        let propertyType;\n\n        propertyType = property.getType();\n\n        const propertyTypeVerified = this.verifyPropertyType(propertyType);\n\n        if (propertyTypeVerified) {\n          const propertyTypeName = propertyType.getName();\n\n          propertyType = this.fileContext.findTypeByTypeName(propertyTypeName);\n\n          const type = propertyType;  ///\n\n          property.setType(type);\n\n          propertyVerified = true;\n        }\n      }\n    }\n\n    if (propertyVerified) {\n      this.fileContext.debug(`verified the '${propertyString}' property.`);\n    }\n\n    return propertyVerified;\n  }\n\n  verifyProperties(properties) {\n    let propertiesVerified;\n\n    const superTypes = this.type.getSuperTypes();\n\n    propertiesVerified = superTypes.every((superType) => {\n      const superTypeProperties = superType.getProperties(),\n            propertiesVerified = properties.every((property) => {\n              const propertyVerified = this.verifyProperty(property, properties, superTypeProperties);\n\n              if (propertyVerified) {\n                return true;\n              }\n            });\n\n      if (propertiesVerified) {\n        return true;\n      }\n    });\n\n    return propertiesVerified;\n  }\n\n  verifySuperTypes() {\n    let superTypesVerified = true;\n\n    const superTypes = this.type.getSuperTypes(),\n          superTypesString = superTypesStringFromSuperTypes(superTypes);\n\n    if (superTypesString !== null) {\n      const typeName = this.type.getString();\n\n      this.fileContext.trace(`Verifying the '${typeName}' type's ${superTypesString} super types...`);\n\n      superTypesVerified = superTypes.every((superType) => {\n        const superTypeName = superType.getName(),\n          superTypePresent = this.fileContext.isTypePresentByTypeName(superTypeName);\n\n        if (superTypePresent) {\n          return true;\n        }\n      });\n\n      if (superTypesVerified) {\n        this.fileContext.debug(`...verified the '${typeName}' type's ${superTypesString} super types.`);\n      }\n    }\n\n    return superTypesVerified;\n  }\n\n  verifyPropertyType(propertyType) {\n    let propertyTypeVerified = false;\n\n    if (propertyType === objectType) {\n      propertyTypeVerified = true;\n    } else {\n      const propertyTypeString = propertyType.getString(); ///\n\n      this.fileContext.trace(`Verifying the '${propertyTypeString}' property type...`);\n\n      const propertyTypeName = propertyType.getName(),\n            propertyTypePresent = this.fileContext.isTypePresentByTypeName(propertyTypeName);\n\n      if (!propertyTypePresent) {\n        const propertyTypeString = propertyType.getString();\n\n        this.fileContext.debug(`The '${propertyTypeString}' property type is not present.`);\n      } else {\n        propertyTypeVerified = true;\n      }\n\n      if (propertyTypeVerified) {\n        this.fileContext.debug(`...verified the '${propertyTypeString}' property type.`);\n      }\n    }\n\n    return propertyTypeVerified;\n  }\n\n  static name = \"ComplexTypeDeclaration\";\n\n  static fromComplexTypeDeclarationNode(complexTypeDeclarationNode, fileContext) {\n    const { Type } = dom,\n          node = complexTypeDeclarationNode,  ///\n          string = fileContext.nodeAsString(node),\n          type = Type.fromComplexTypeDeclarationNode(complexTypeDeclarationNode, fileContext),\n          complexTypeDeclaration = new ComplexTypeDeclaration(fileContext, string, type);\n\n    return complexTypeDeclaration;\n  }\n});\n"],"names":["domAssigned","ComplexTypeDeclaration","fileContext","string","type","getFileContext","getString","getType","verify","verified","complexTypeDeclarationString","trace","typeVerified","verifyType","superTypesVerified","verifySuperTypes","includeSuperTypes","properties","getProperties","propertiesVerified","verifyProperties","superTypes","getSuperTypes","map","superType","superTypeName","getName","findTypeByTypeName","setSuperTypes","addType","debug","typeName","typePresent","isTypePresentByTypeName","verifyProperty","property","superTypeProperties","propertyVerified","propertyString","propertyNames","getNames","count","reduce","propertyNamesMatch","matchPropertyNames","superTypeProperty","find","propertyNameMatches","superTypePropertyString","propertyType","propertyTypeVerified","verifyPropertyType","propertyTypeName","setType","every","superTypesString","superTypesStringFromSuperTypes","superTypePresent","objectType","propertyTypeString","propertyTypePresent","fromComplexTypeDeclarationNode","complexTypeDeclarationNode","Type","dom","node","nodeAsString","complexTypeDeclaration","name"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/dom/declaration/complexType.js"],"sourcesContent":["\"use strict\";\n\nimport dom from \"../../dom\";\n\nimport { objectType } from \"../type\";\nimport { domAssigned } from \"../../dom\";\nimport { superTypesStringFromSuperTypes } from \"../declaration/type\";\n\nexport default domAssigned(class ComplexTypeDeclaration {\n  constructor(fileContext, string, type) {\n    this.fileContext = fileContext;\n    this.string = string;\n    this.type = type;\n  }\n\n  getFileContext() {\n    return this.fileContext;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getType() {\n    return this.type;\n  }\n\n  verify() {\n    let verified = false;\n\n    const complexTypeDeclarationString = this.getString();\n\n    this.fileContext.trace(`Verifying the '${complexTypeDeclarationString}' complex type declaration...`);\n\n    const typeVerified = this.verifyType();\n\n    if (typeVerified) {\n      const superTypesVerified = this.verifySuperTypes();\n\n      if (superTypesVerified) {\n        let superTypes;\n\n        superTypes = this.type.getSuperTypes();\n\n        superTypes = superTypes.map((superType) => {\n          const superTypeName = superType.getName();\n\n          superType = this.fileContext.findTypeByTypeName(superTypeName);\n\n          return superType;\n        });\n\n        this.type.setSuperTypes(superTypes);\n\n        const includeSuperTypes = false,\n              properties = this.type.getProperties(includeSuperTypes),\n              propertiesVerified = this.verifyProperties(properties);\n\n        if (propertiesVerified) {\n          this.fileContext.addType(this.type);\n\n          verified = true;\n        }\n      }\n    }\n\n    if (verified) {\n      this.fileContext.debug(`...verified the '${complexTypeDeclarationString}' complex type declaration.`);\n    }\n\n    return verified;\n  }\n\n  verifyType() {\n    let typeVerified = false;\n\n    const typeName = this.type.getName();\n\n    this.fileContext.trace(`Verifying the '${typeName}' type...`);\n\n    const typePresent = this.fileContext.isTypePresentByTypeName(typeName);\n\n    if (typePresent) {\n      this.fileContext.debug(`The type '${typeName}' is already present.`);\n    } else {\n      typeVerified = true;\n    }\n\n    if (typeVerified) {\n      this.fileContext.debug(`...verified the '${typeName}' type.`);\n    }\n\n    return typeVerified;\n  }\n\n  verifyProperty(property, properties, superTypeProperties) {\n    let propertyVerified = false;\n\n    const propertyString = property.getString();\n\n    this.fileContext.trace(`Verifying the '${propertyString}' property...`);\n\n    const propertyNames = property.getNames(),\n          count = properties.reduce((count, property) => {\n            const propertyNamesMatch = property.matchPropertyNames(propertyNames);\n\n            if (propertyNamesMatch) {\n              count++;\n            }\n\n            return count;\n          }, 0);\n\n    if (count > 1) {\n      this.fileContext.debug(`The '${propertyString}' property appears more than once.`);\n    } else {\n      const superTypeProperty = superTypeProperties.find((superTypeProperty) => {\n        const propertyNameMatches = superTypeProperty.matchPropertyNames(propertyNames);\n\n        if (propertyNameMatches) {\n          return true;\n        }\n      }) || null;\n\n      if (superTypeProperty !== null) {\n        const superTypePropertyString = superTypeProperty.getString();\n\n        this.fileContext.debug(`The '${propertyString}' property matches the super type's '${superTypePropertyString}' property.`);\n      } else {\n        let propertyType;\n\n        propertyType = property.getType();\n\n        const propertyTypeVerified = this.verifyPropertyType(propertyType);\n\n        if (propertyTypeVerified) {\n          const propertyTypeName = propertyType.getName();\n\n          propertyType = this.fileContext.findTypeByTypeName(propertyTypeName);\n\n          const type = propertyType;  ///\n\n          property.setType(type);\n\n          propertyVerified = true;\n        }\n      }\n    }\n\n    if (propertyVerified) {\n      this.fileContext.debug(`verified the '${propertyString}' property.`);\n    }\n\n    return propertyVerified;\n  }\n\n  verifyProperties(properties) {\n    let propertiesVerified;\n\n    const superTypes = this.type.getSuperTypes();\n\n    propertiesVerified = superTypes.every((superType) => {\n      const superTypeProperties = superType.getProperties(),\n            propertiesVerified = properties.every((property) => {\n              const propertyVerified = this.verifyProperty(property, properties, superTypeProperties);\n\n              if (propertyVerified) {\n                return true;\n              }\n            });\n\n      if (propertiesVerified) {\n        return true;\n      }\n    });\n\n    return propertiesVerified;\n  }\n\n  verifySuperTypes() {\n    let superTypesVerified = true;\n\n    const superTypes = this.type.getSuperTypes(),\n          superTypesString = superTypesStringFromSuperTypes(superTypes);\n\n    if (superTypesString !== null) {\n      const typeName = this.type.getString();\n\n      this.fileContext.trace(`Verifying the '${typeName}' type's ${superTypesString} super types...`);\n\n      superTypesVerified = superTypes.every((superType) => {\n        const superTypeName = superType.getName(),\n          superTypePresent = this.fileContext.isTypePresentByTypeName(superTypeName);\n\n        if (superTypePresent) {\n          return true;\n        }\n      });\n\n      if (superTypesVerified) {\n        this.fileContext.debug(`...verified the '${typeName}' type's ${superTypesString} super types.`);\n      }\n    }\n\n    return superTypesVerified;\n  }\n\n  verifyPropertyType(propertyType) {\n    let propertyTypeVerified = false;\n\n    if (propertyType === objectType) {\n      propertyTypeVerified = true;\n    } else {\n      const typeName = this.type.getName(),\n            propertyTypeName = propertyType.getName();\n\n      if (typeName === propertyTypeName) {\n        propertyTypeVerified = true;\n      } else  {\n        const propertyTypeString = propertyType.getString(); ///\n\n        this.fileContext.trace(`Verifying the '${propertyTypeString}' property type...`);\n\n        const propertyTypePresent = this.fileContext.isTypePresentByTypeName(propertyTypeName);\n\n        if (!propertyTypePresent) {\n          const propertyTypeString = propertyType.getString();\n\n          this.fileContext.debug(`The '${propertyTypeString}' property type is not present.`);\n        } else {\n          propertyTypeVerified = true;\n        }\n\n        if (propertyTypeVerified) {\n          this.fileContext.debug(`...verified the '${propertyTypeString}' property type.`);\n        }\n      }\n    }\n\n    return propertyTypeVerified;\n  }\n\n  static name = \"ComplexTypeDeclaration\";\n\n  static fromComplexTypeDeclarationNode(complexTypeDeclarationNode, fileContext) {\n    const { Type } = dom,\n          node = complexTypeDeclarationNode,  ///\n          string = fileContext.nodeAsString(node),\n          type = Type.fromComplexTypeDeclarationNode(complexTypeDeclarationNode, fileContext),\n          complexTypeDeclaration = new ComplexTypeDeclaration(fileContext, string, type);\n\n    return complexTypeDeclaration;\n  }\n});\n"],"names":["domAssigned","ComplexTypeDeclaration","fileContext","string","type","getFileContext","getString","getType","verify","verified","complexTypeDeclarationString","trace","typeVerified","verifyType","superTypesVerified","verifySuperTypes","superTypes","getSuperTypes","map","superType","superTypeName","getName","findTypeByTypeName","setSuperTypes","includeSuperTypes","properties","getProperties","propertiesVerified","verifyProperties","addType","debug","typeName","typePresent","isTypePresentByTypeName","verifyProperty","property","superTypeProperties","propertyVerified","propertyString","propertyNames","getNames","count","reduce","propertyNamesMatch","matchPropertyNames","superTypeProperty","find","propertyNameMatches","superTypePropertyString","propertyType","propertyTypeVerified","verifyPropertyType","propertyTypeName","setType","every","superTypesString","superTypesStringFromSuperTypes","superTypePresent","objectType","propertyTypeString","propertyTypePresent","fromComplexTypeDeclarationNode","complexTypeDeclarationNode","Type","dom","node","nodeAsString","complexTypeDeclaration","name"],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "1.0.46",
+  "version": "1.0.48",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",
@@ -12,10 +12,10 @@
   "dependencies": {
     "argumentative": "^2.0.32",
     "necessary": "^14.2.1",
-    "occam-custom-grammars": "^5.0.1070",
-    "occam-entities": "^1.0.282",
-    "occam-file-system": "^6.0.304",
-    "occam-furtle": "^2.0.56",
+    "occam-custom-grammars": "^5.0.1071",
+    "occam-entities": "^1.0.283",
+    "occam-file-system": "^6.0.305",
+    "occam-furtle": "^2.0.57",
     "occam-grammar-utilities": "^8.0.250",
     "occam-lexers": "^23.0.37",
     "occam-parsers": "^23.0.42",

package/src/dom/declaration/complexType.js

@@ -38,25 +38,25 @@ export default domAssigned(class ComplexTypeDeclaration {
       const superTypesVerified = this.verifySuperTypes();
 
       if (superTypesVerified) {
-        const includeSuperTypes = false,
-              properties = this.type.getProperties(includeSuperTypes),
-              propertiesVerified = this.verifyProperties(properties);
+        let superTypes;
 
-        if (propertiesVerified) {
-          let superTypes;
+        superTypes = this.type.getSuperTypes();
 
-          superTypes = this.type.getSuperTypes();
+        superTypes = superTypes.map((superType) => {
+          const superTypeName = superType.getName();
 
-          superTypes = superTypes.map((superType) => {
-            const superTypeName = superType.getName();
+          superType = this.fileContext.findTypeByTypeName(superTypeName);
 
-            superType = this.fileContext.findTypeByTypeName(superTypeName);
+          return superType;
+        });
 
-            return superType;
-          });
+        this.type.setSuperTypes(superTypes);
 
-          this.type.setSuperTypes(superTypes);
+        const includeSuperTypes = false,
+              properties = this.type.getProperties(includeSuperTypes),
+              propertiesVerified = this.verifyProperties(properties);
 
+        if (propertiesVerified) {
           this.fileContext.addType(this.type);
 
           verified = true;
@@ -211,23 +211,29 @@ export default domAssigned(class ComplexTypeDeclaration {
     if (propertyType === objectType) {
       propertyTypeVerified = true;
     } else {
-      const propertyTypeString = propertyType.getString(); ///
+      const typeName = this.type.getName(),
+            propertyTypeName = propertyType.getName();
 
-      this.fileContext.trace(`Verifying the '${propertyTypeString}' property type...`);
+      if (typeName === propertyTypeName) {
+        propertyTypeVerified = true;
+      } else  {
+        const propertyTypeString = propertyType.getString(); ///
 
-      const propertyTypeName = propertyType.getName(),
-            propertyTypePresent = this.fileContext.isTypePresentByTypeName(propertyTypeName);
+        this.fileContext.trace(`Verifying the '${propertyTypeString}' property type...`);
 
-      if (!propertyTypePresent) {
-        const propertyTypeString = propertyType.getString();
+        const propertyTypePresent = this.fileContext.isTypePresentByTypeName(propertyTypeName);
 
-        this.fileContext.debug(`The '${propertyTypeString}' property type is not present.`);
-      } else {
-        propertyTypeVerified = true;
-      }
+        if (!propertyTypePresent) {
+          const propertyTypeString = propertyType.getString();
 
-      if (propertyTypeVerified) {
-        this.fileContext.debug(`...verified the '${propertyTypeString}' property type.`);
+          this.fileContext.debug(`The '${propertyTypeString}' property type is not present.`);
+        } else {
+          propertyTypeVerified = true;
+        }
+
+        if (propertyTypeVerified) {
+          this.fileContext.debug(`...verified the '${propertyTypeString}' property type.`);
+        }
       }
     }