From 83be0712c921fd49e373cef3548816fa9f85b47e Mon Sep 17 00:00:00 2001
From: Kevin Pearson <kevin_pearson@cable.comcast.com>
Date: Mon, 8 Jul 2024 08:29:50 -0700
Subject: [PATCH] fix: SchemasMatch handling null

---
 src/validate/validator/index.mjs | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/validate/validator/index.mjs b/src/validate/validator/index.mjs
index 687aaada..6c7b83f4 100644
--- a/src/validate/validator/index.mjs
+++ b/src/validate/validator/index.mjs
@@ -48,8 +48,8 @@ const addFailingMethodSchema = (error, json, schema) => {
         const i = parseInt(error.schemaPath.split("/")[2])
         error.params.failingSchema = schema.definitions.Method.allOf[i].then.$ref
       }
-  
-    }  
+
+    }
   }
 }
 
@@ -61,7 +61,7 @@ export const pruneErrors = (errors = []) => {
 
   Object.values(groups).forEach( group => {
     const paths = []
-    pruned.push(group.sort( (a, b) => b.schemaPath.split('/').length - a.schemaPath.split('/').length ).pop())  
+    pruned.push(group.sort( (a, b) => b.schemaPath.split('/').length - a.schemaPath.split('/').length ).pop())
   })
 
   return pruned
@@ -163,12 +163,18 @@ export const validate = (json = {}, schemas = {}, ajv, validator, additionalPack
     validator.errors.forEach(error => error.source = 'OpenRPC')
 
     errors.push(...pruneErrors(validator.errors))
-  } 
+  }
 
   return { valid: valid, title: json.title || json.info.title, errors: errors }
 }
 
 const schemasMatch = (a, b) => {
+  if (a == null) {
+    return b == null
+  }
+  if (b == null) {
+    return a == null
+  }
   const aKeys = Object.keys(a)
   const bKeys = Object.keys(b)
   const keysMatch = (aKeys.length == bKeys.length) && aKeys.every(key => bKeys.includes(key))
@@ -229,7 +235,7 @@ export const validatePasshtroughs = (json) => {
 
     if (!schemasMatch(source, destination)) {
       const properties = getPropertiesInSchema(destination, json)
-      
+
       // follow $refs so we can see the schemas
       source = getPropertySchema(source, '.', json)
       destination = getPropertySchema(destination, '.', json)
@@ -270,4 +276,4 @@ export const validatePasshtroughs = (json) => {
 
   return result
 
-}
\ No newline at end of file
+}