lint: refactor as isObject and hasObject

src/lint/concept_exercises.nim

@@ -2,22 +2,22 @@ import std/[json, os, terminal]
 import ".."/helpers
 import "."/validators
 
-proc isValidAuthorOrContributor(data: JsonNode, key: string, path: string): bool =
-  if isObject(data, "", path):
+proc isValidAuthorOrContributor(data: JsonNode, context: string, path: string): bool =
+  if isObject(data, context, path):
     result = true
     checkString("github_username")
     checkString("exercism_username", isRequired = false)
 
 template checkFiles(data: JsonNode, context, path: string) =
-  if isObject(data, context, path):
+  if hasObject(data, context, path):
     checkArrayOfStrings(context, "solution")
     checkArrayOfStrings(context, "test")
     checkArrayOfStrings(context, "exemplar")
   else:
     result = false
 
 proc isValidConceptExerciseConfig(data: JsonNode, path: string): bool =
-  if isObject(data, "", path):
+  if isObject(data, "root", path):
     result = true
     checkArrayOf("authors", isValidAuthorOrContributor)
     checkArrayOf("contributors", isValidAuthorOrContributor, isRequired = false)

src/lint/validators.nim

@@ -5,13 +5,15 @@ export strutils.strip
 proc q(s: string): string =
   "'" & s & "'"
 
-proc isObject*(data: JsonNode, key: string, path: string,
+proc isObject*(data: JsonNode; context, path: string): bool =
+  result = true
+  if data.kind != JObject:
+    writeError("Not an object: " & q(context), path)
+
+proc hasObject*(data: JsonNode; key, path: string,
                isRequired = true): bool =
   result = true
-  if key.len == 0:
-    if data.kind != JObject:
-      writeError("JSON root is not an object", path)
-  elif data.hasKey(key):
+  if data.hasKey(key):
     if data[key].kind != JObject:
       writeError("Not an object: " & q(key), path)
   elif isRequired: