Port antipattern/exclusive_(max|min)imum_number_and_(max|min)imum f…

…rom JSON BinPack Signed-off-by: Juan Cruz Viotti <[email protected]>
sourcemeta · Sep 9, 2024 · 0e4bb8e · 0e4bb8e
1 parent ff818e2
commit 0e4bb8e
Show file tree

Hide file tree

Showing 9 changed files with 528 additions and 2 deletions.
diff --git a/src/linter/CMakeLists.txt b/src/linter/CMakeLists.txt
@@ -8,6 +8,8 @@ noa_library(NAMESPACE sourcemeta PROJECT alterschema NAME linter
     antipattern/const_with_type.h
     antipattern/duplicate_enum_values.h
     antipattern/duplicate_required_values.h
+    antipattern/exclusive_maximum_number_and_maximum.h
+    antipattern/exclusive_minimum_number_and_minimum.h
     antipattern/enum_with_type.h
 
     # Simplify

diff --git a/src/linter/antipattern/duplicate_required_values.h b/src/linter/antipattern/duplicate_required_values.h
@@ -1,9 +1,9 @@
 class DuplicateRequiredValues final : public Rule {
 public:
   DuplicateRequiredValues()
-      : Rule("duplicate_required_values",
+      : Rule{"duplicate_required_values",
              "Setting duplicate values in `required` is considered an "
-             "anti-pattern") {};
+             "anti-pattern"} {};
 
   [[nodiscard]] auto
   condition(const sourcemeta::jsontoolkit::JSON &schema, const std::string &,

diff --git a/src/linter/antipattern/exclusive_maximum_number_and_maximum.h b/src/linter/antipattern/exclusive_maximum_number_and_maximum.h
@@ -0,0 +1,32 @@
+class ExclusiveMaximumNumberAndMaximum final : public Rule {
+public:
+  ExclusiveMaximumNumberAndMaximum()
+      : Rule{"exclusive_maximum_number_and_maximum",
+             "Setting both `exclusiveMaximum` and `maximum` at the same time "
+             "is considered an anti-pattern. You should choose one"} {};
+
+  [[nodiscard]] auto
+  condition(const sourcemeta::jsontoolkit::JSON &schema, const std::string &,
+            const std::set<std::string> &vocabularies,
+            const sourcemeta::jsontoolkit::Pointer &) const -> bool override {
+    return contains_any(
+               vocabularies,
+               {"https://json-schema.org/draft/2020-12/vocab/validation",
+                "https://json-schema.org/draft/2019-09/vocab/validation",
+                "http://json-schema.org/draft-07/schema#",
+                "http://json-schema.org/draft-06/schema#"}) &&
+           schema.is_object() && schema.defines("maximum") &&
+           schema.defines("exclusiveMaximum") &&
+           schema.at("maximum").is_number() &&
+           schema.at("exclusiveMaximum").is_number();
+  }
+
+  auto transform(Transformer &transformer) const -> void override {
+    if (transformer.schema().at("maximum") <
+        transformer.schema().at("exclusiveMaximum")) {
+      transformer.erase("exclusiveMaximum");
+    } else {
+      transformer.erase("maximum");
+    }
+  }
+};
diff --git a/src/linter/antipattern/exclusive_minimum_number_and_minimum.h b/src/linter/antipattern/exclusive_minimum_number_and_minimum.h
@@ -0,0 +1,32 @@
+class ExclusiveMinimumNumberAndMinimum final : public Rule {
+public:
+  ExclusiveMinimumNumberAndMinimum()
+      : Rule{"exclusive_minimum_number_and_minimum",
+             "Setting both `exclusiveMinimum` and `minimum` at the same time "
+             "is considered an anti-pattern. You should choose one"} {};
+
+  [[nodiscard]] auto
+  condition(const sourcemeta::jsontoolkit::JSON &schema, const std::string &,
+            const std::set<std::string> &vocabularies,
+            const sourcemeta::jsontoolkit::Pointer &) const -> bool override {
+    return contains_any(
+               vocabularies,
+               {"https://json-schema.org/draft/2020-12/vocab/validation",
+                "https://json-schema.org/draft/2019-09/vocab/validation",
+                "http://json-schema.org/draft-07/schema#",
+                "http://json-schema.org/draft-06/schema#"}) &&
+           schema.is_object() && schema.defines("minimum") &&
+           schema.defines("exclusiveMinimum") &&
+           schema.at("minimum").is_number() &&
+           schema.at("exclusiveMinimum").is_number();
+  }
+
+  auto transform(Transformer &transformer) const -> void override {
+    if (transformer.schema().at("exclusiveMinimum") <
+        transformer.schema().at("minimum")) {
+      transformer.erase("exclusiveMinimum");
+    } else {
+      transformer.erase("minimum");
+    }
+  }
+};
diff --git a/src/linter/linter.cc b/src/linter/linter.cc
@@ -20,6 +20,8 @@ auto contains_any(const T &container, const T &values) -> bool {
 #include "antipattern/duplicate_enum_values.h"
 #include "antipattern/duplicate_required_values.h"
 #include "antipattern/enum_with_type.h"
+#include "antipattern/exclusive_maximum_number_and_maximum.h"
+#include "antipattern/exclusive_minimum_number_and_minimum.h"
 // Simplify
 #include "simplify/single_type_array.h"
 // Redundant
@@ -49,6 +51,8 @@ auto add(Bundle &bundle, const LinterCategory category) -> void {
       bundle.add<DuplicateEnumValues>();
       bundle.add<DuplicateRequiredValues>();
       bundle.add<ConstWithType>();
+      bundle.add<ExclusiveMaximumNumberAndMaximum>();
+      bundle.add<ExclusiveMinimumNumberAndMinimum>();
       break;
     case LinterCategory::Simplify:
       bundle.add<SingleTypeArray>();

diff --git a/test/linter/2019_09_test.cc b/test/linter/2019_09_test.cc
@@ -586,3 +586,117 @@ TEST(Lint_2019_09, duplicate_required_values_1) {
 
   EXPECT_EQ(document, expected);
 }
+
+TEST(Lint_2019_09, exclusive_maximum_number_and_maximum_1) {
+  sourcemeta::jsontoolkit::JSON document =
+      sourcemeta::jsontoolkit::parse(R"JSON({
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "exclusiveMaximum": 3,
+    "maximum": 3
+  })JSON");
+
+  LINT_AND_FIX(document);
+
+  const sourcemeta::jsontoolkit::JSON expected =
+      sourcemeta::jsontoolkit::parse(R"JSON({
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "exclusiveMaximum": 3
+  })JSON");
+
+  EXPECT_EQ(document, expected);
+}
+
+TEST(Lint_2019_09, exclusive_maximum_number_and_maximum_2) {
+  sourcemeta::jsontoolkit::JSON document =
+      sourcemeta::jsontoolkit::parse(R"JSON({
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "exclusiveMaximum": 3,
+    "maximum": 2
+  })JSON");
+
+  LINT_AND_FIX(document);
+
+  const sourcemeta::jsontoolkit::JSON expected =
+      sourcemeta::jsontoolkit::parse(R"JSON({
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "maximum": 2
+  })JSON");
+
+  EXPECT_EQ(document, expected);
+}
+
+TEST(Lint_2019_09, exclusive_maximum_number_and_maximum_3) {
+  sourcemeta::jsontoolkit::JSON document =
+      sourcemeta::jsontoolkit::parse(R"JSON({
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "exclusiveMaximum": 3,
+    "maximum": 1
+  })JSON");
+
+  LINT_AND_FIX(document);
+
+  const sourcemeta::jsontoolkit::JSON expected =
+      sourcemeta::jsontoolkit::parse(R"JSON({
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "maximum": 1
+  })JSON");
+
+  EXPECT_EQ(document, expected);
+}
+
+TEST(Lint_2019_09, exclusive_minimum_number_and_minimum_1) {
+  sourcemeta::jsontoolkit::JSON document =
+      sourcemeta::jsontoolkit::parse(R"JSON({
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "exclusiveMinimum": 3,
+    "minimum": 3
+  })JSON");
+
+  LINT_AND_FIX(document);
+
+  const sourcemeta::jsontoolkit::JSON expected =
+      sourcemeta::jsontoolkit::parse(R"JSON({
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "exclusiveMinimum": 3
+  })JSON");
+
+  EXPECT_EQ(document, expected);
+}
+
+TEST(Lint_2019_09, exclusive_minimum_number_and_minimum_2) {
+  sourcemeta::jsontoolkit::JSON document =
+      sourcemeta::jsontoolkit::parse(R"JSON({
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "exclusiveMinimum": 3,
+    "minimum": 2
+  })JSON");
+
+  LINT_AND_FIX(document);
+
+  const sourcemeta::jsontoolkit::JSON expected =
+      sourcemeta::jsontoolkit::parse(R"JSON({
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "exclusiveMinimum": 3
+  })JSON");
+
+  EXPECT_EQ(document, expected);
+}
+
+TEST(Lint_2019_09, exclusive_minimum_number_and_minimum_3) {
+  sourcemeta::jsontoolkit::JSON document =
+      sourcemeta::jsontoolkit::parse(R"JSON({
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "exclusiveMinimum": 3,
+    "minimum": 4
+  })JSON");
+
+  LINT_AND_FIX(document);
+
+  const sourcemeta::jsontoolkit::JSON expected =
+      sourcemeta::jsontoolkit::parse(R"JSON({
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
+    "minimum": 4
+  })JSON");
+
+  EXPECT_EQ(document, expected);
+}
diff --git a/test/linter/2020_12_test.cc b/test/linter/2020_12_test.cc
@@ -569,3 +569,117 @@ TEST(Lint_2020_12, duplicate_required_values_1) {
 
   EXPECT_EQ(document, expected);
 }
+
+TEST(Lint_2020_12, exclusive_maximum_number_and_maximum_1) {
+  sourcemeta::jsontoolkit::JSON document =
+      sourcemeta::jsontoolkit::parse(R"JSON({
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "exclusiveMaximum": 3,
+    "maximum": 3
+  })JSON");
+
+  LINT_AND_FIX(document);
+
+  const sourcemeta::jsontoolkit::JSON expected =
+      sourcemeta::jsontoolkit::parse(R"JSON({
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "exclusiveMaximum": 3
+  })JSON");
+
+  EXPECT_EQ(document, expected);
+}
+
+TEST(Lint_2020_12, exclusive_maximum_number_and_maximum_2) {
+  sourcemeta::jsontoolkit::JSON document =
+      sourcemeta::jsontoolkit::parse(R"JSON({
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "exclusiveMaximum": 3,
+    "maximum": 2
+  })JSON");
+
+  LINT_AND_FIX(document);
+
+  const sourcemeta::jsontoolkit::JSON expected =
+      sourcemeta::jsontoolkit::parse(R"JSON({
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "maximum": 2
+  })JSON");
+
+  EXPECT_EQ(document, expected);
+}
+
+TEST(Lint_2020_12, exclusive_maximum_number_and_maximum_3) {
+  sourcemeta::jsontoolkit::JSON document =
+      sourcemeta::jsontoolkit::parse(R"JSON({
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "exclusiveMaximum": 3,
+    "maximum": 1
+  })JSON");
+
+  LINT_AND_FIX(document);
+
+  const sourcemeta::jsontoolkit::JSON expected =
+      sourcemeta::jsontoolkit::parse(R"JSON({
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "maximum": 1
+  })JSON");
+
+  EXPECT_EQ(document, expected);
+}
+
+TEST(Lint_2020_12, exclusive_minimum_number_and_minimum_1) {
+  sourcemeta::jsontoolkit::JSON document =
+      sourcemeta::jsontoolkit::parse(R"JSON({
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "exclusiveMinimum": 3,
+    "minimum": 3
+  })JSON");
+
+  LINT_AND_FIX(document);
+
+  const sourcemeta::jsontoolkit::JSON expected =
+      sourcemeta::jsontoolkit::parse(R"JSON({
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "exclusiveMinimum": 3
+  })JSON");
+
+  EXPECT_EQ(document, expected);
+}
+
+TEST(Lint_2020_12, exclusive_minimum_number_and_minimum_2) {
+  sourcemeta::jsontoolkit::JSON document =
+      sourcemeta::jsontoolkit::parse(R"JSON({
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "exclusiveMinimum": 3,
+    "minimum": 2
+  })JSON");
+
+  LINT_AND_FIX(document);
+
+  const sourcemeta::jsontoolkit::JSON expected =
+      sourcemeta::jsontoolkit::parse(R"JSON({
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "exclusiveMinimum": 3
+  })JSON");
+
+  EXPECT_EQ(document, expected);
+}
+
+TEST(Lint_2020_12, exclusive_minimum_number_and_minimum_3) {
+  sourcemeta::jsontoolkit::JSON document =
+      sourcemeta::jsontoolkit::parse(R"JSON({
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "exclusiveMinimum": 3,
+    "minimum": 4
+  })JSON");
+
+  LINT_AND_FIX(document);
+
+  const sourcemeta::jsontoolkit::JSON expected =
+      sourcemeta::jsontoolkit::parse(R"JSON({
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "minimum": 4
+  })JSON");
+
+  EXPECT_EQ(document, expected);
+}