Consume built-in lint rules from JSON Toolkit

Signed-off-by: Juan Cruz Viotti <[email protected]>

DEPENDENCIES

@@ -1,4 +1,4 @@
 vendorpull https://github.com/sourcemeta/vendorpull dea311b5bfb53b6926a4140267959ae334d3ecf4
 noa https://github.com/sourcemeta/noa 5ff4024902642afc9cc2f9a9e02ae9dff9d15d4f
-jsontoolkit https://github.com/sourcemeta/jsontoolkit 503146c9412c040bcbcdb9a09a6da42c300d3435
+jsontoolkit https://github.com/sourcemeta/jsontoolkit 72dde22434cfa827201dbde10af976c82bd99a43
 hydra https://github.com/sourcemeta/hydra d5e0c314dae88b0bf2ac4eeff2c7395910e2c7e9

src/CMakeLists.txt

@@ -6,8 +6,7 @@ add_executable(jsonschema_cli
   command_bundle.cc
   command_test.cc
   command_lint.cc
-  command_validate.cc
-  lint/enum_with_type.h)
+  command_validate.cc)
 intelligence_jsonschema_add_compile_options(jsonschema_cli)
 set_target_properties(jsonschema_cli PROPERTIES OUTPUT_NAME jsonschema)
 target_link_libraries(jsonschema_cli PRIVATE sourcemeta::jsontoolkit::uri)

src/command_lint.cc

@@ -7,17 +7,18 @@
 #include "command.h"
 #include "utils.h"
 
-#include "lint/enum_with_type.h"
-
 // TODO: Implement a --fix flag
 auto intelligence::jsonschema::cli::lint(
     const std::span<const std::string> &arguments) -> int {
   const auto options{parse_options(arguments, {})};
 
   sourcemeta::jsontoolkit::SchemaTransformBundle bundle;
-  bundle.add<EnumWithType>();
-  bool result{true};
+  bundle.add(
+      sourcemeta::jsontoolkit::SchemaTransformBundle::Category::Modernize);
+  bundle.add(
+      sourcemeta::jsontoolkit::SchemaTransformBundle::Category::AntiPattern);
 
+  bool result{true};
   for (const auto &entry : for_each_json(options.at(""))) {
     const bool subresult = bundle.check(
         entry.second, sourcemeta::jsontoolkit::default_schema_walker,
@@ -29,7 +30,9 @@ auto intelligence::jsonschema::cli::lint(
           std::cout << " " << message << " (" << name << ")\n";
         });
 
-    result = result || subresult;
+    if (!subresult) {
+      result = false;
+    }
   }
 
   return result ? EXIT_SUCCESS : EXIT_FAILURE;

test/CMakeLists.txt

@@ -20,3 +20,5 @@ add_jsonschema_test_unix(bundle_remote_single_schema)
 add_jsonschema_test_unix(test_single_pass)
 add_jsonschema_test_unix(test_single_fail)
 add_jsonschema_test_unix(test_single_unsupported)
+add_jsonschema_test_unix(lint_pass)
+add_jsonschema_test_unix(lint_fail)

test/lint_fail.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -o errexit
+set -o nounset
+
+TMP="$(mktemp -d)"
+# shellcheck disable=SC2317
+clean() { rm -rf "$TMP"; }
+trap clean EXIT
+
+cat << 'EOF' > "$TMP/schema.json"
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "string",
+  "enum": [ "foo" ]
+}
+EOF
+
+"$1" lint "$TMP/schema.json" && CODE="$?" || CODE="$?"
+
+if [ "$CODE" = "0" ]
+then
+  echo "FAIL" 1>&2
+  exit 1
+else
+  echo "PASS" 1>&2
+  exit 0
+fi

test/lint_pass.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -o errexit
+set -o nounset
+
+TMP="$(mktemp -d)"
+# shellcheck disable=SC2317
+clean() { rm -rf "$TMP"; }
+trap clean EXIT
+
+cat << 'EOF' > "$TMP/schema.json"
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "string"
+}
+EOF
+
+"$1" lint "$TMP/schema.json"