Provide doc-comments with makeHandler(); cleanup
@@ -34,10 +34,20 @@ var errFn = function(err, api) {
process.exit(1);
};
+/**
+ * @brief Produce a handler for parser.validate().
+ * Recommended usage: `parser.validate(filename, makeHandler(filename));`
+ * or `parser.validate(schema, makeHandler());`.
+ * @param scope - usually a filename, this will be used to denote
+ * an (in)valid schema in console output; "Schema" if undefined
+ * @returns {function} the handler that can be passed to parser.validate
+ */
function makeHandler(scope) {
+ if (!scope)
+ scope = "Schema";
return function(err, api, metadata) {
if (err) {
- console.error("%s is not valid.", scope);
+ console.error("%s is not valid.", scope || "Schema");
errFn(err, api, metadata); // Won't return
}
@@ -45,7 +55,7 @@ function makeHandler(scope) {
var operationsMap = api.paths[endpoint];
Object.keys(operationsMap).forEach(function (verb) {
if (!operationsMap[verb]["operationId"]) {
- console.log("%s is not valid", scope);
+ console.error("%s is not valid", scope);
errFn("operationId is missing in " + endpoint + ", verb " + verb, api);
}
})
@@ -71,6 +81,6 @@ if (isDir) {
});
}
else{
- parser.validate(opts.schema, makeHandler(opt.schema));
+ parser.validate(opts.schema, makeHandler(opts.schema));
}
