Fixed minor edgecases

Signed-off-by: Marcin Olko <molko@google.com>

Author: m-olko

providers/flagd/src/evaluator/json_logic/BUILD

@@ -1,4 +1,4 @@
-load("@rules_cc//cc:defs.bzl", "cc_library")
+load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
 
 cc_library(
     name = "json_logic",
@@ -28,3 +28,13 @@ cc_library(
         "@nlohmann_json//:json",
     ],
 )
+
+cc_binary(
+    name = "cli",
+    srcs = ["cli.cpp"],
+    deps = [
+        ":json_logic",
+        "@abseil-cpp//absl/status",
+        "@nlohmann_json//:json",
+    ],
+)

providers/flagd/src/evaluator/json_logic/cli.cpp

@@ -0,0 +1,53 @@
+#include <exception>
+#include <iostream>
+#include <string>
+
+#include "absl/status/status.h"
+#include "json_logic.h"
+#include "nlohmann/json.hpp"
+
+int main(int argc, char** argv) {
+  if (argc != 3) {
+    std::cerr << "Usage: " << argv[0] << " '<logic_json>' '<data_json>'\n";
+    return 1;
+  }
+
+  std::string logic_str = argv[1];
+  std::string data_str = argv[2];
+
+  nlohmann::json logic;
+  nlohmann::json data;
+  try {
+    logic = nlohmann::json::parse(logic_str);
+  } catch (const std::exception& e) {
+    std::cerr << "Error parsing logic JSON: " << e.what() << "\n";
+    return 1;
+  }
+
+  try {
+    data = nlohmann::json::parse(data_str);
+  } catch (const std::exception& e) {
+    std::cerr << "Error parsing data JSON: " << e.what() << "\n";
+    return 1;
+  }
+
+  try {
+    json_logic::JsonLogic evaluator;
+    auto result = evaluator.Apply(logic, data);
+
+    if (!result.ok()) {
+      std::cerr << "Apply error: " << result.status().ToString() << "\n";
+      return 1;
+    }
+
+    std::cout << result.value().dump() << "\n";
+  } catch (const std::exception& e) {
+    std::cerr << "Exception during evaluation: " << e.what() << "\n";
+    return 2;
+  } catch (...) {
+    std::cerr << "Unknown exception during evaluation.\n";
+    return 2;
+  }
+
+  return 0;
+}

providers/flagd/src/evaluator/json_logic/data.cpp

@@ -73,8 +73,7 @@ absl::StatusOr<nlohmann::json> Var(const JsonLogic& eval,
     return eval.Apply(default_val.value(), data);
   }
 
-  return absl::InvalidArgumentError(
-      "Var key is missing and no default value provided.");
+  return nlohmann::json(nullptr);
 }
 
 absl::StatusOr<nlohmann::json> Missing(const JsonLogic& eval,

providers/flagd/src/evaluator/json_logic/logic.cpp

@@ -68,7 +68,8 @@ absl::StatusOr<nlohmann::json> Not(const JsonLogic& eval,
   if (values.is_array() && values.size() > 1) {
     return absl::InvalidArgumentError("! accepts only single argument.");
   }
-  nlohmann::json sugar = values.is_array() ? values[0] : values;
+  nlohmann::json sugar =
+      (values.is_array() && !values.empty()) ? values[0] : values;
   absl::StatusOr<bool> res = GetBool(eval, sugar, data);
   if (!res.ok()) return res.status();
   return !res.value();
@@ -80,7 +81,8 @@ absl::StatusOr<nlohmann::json> DoubleNegation(const JsonLogic& eval,
   if (values.is_array() && values.size() > 1) {
     return absl::InvalidArgumentError("!! accepts only single argument.");
   }
-  nlohmann::json sugar = values.is_array() ? values[0] : values;
+  nlohmann::json sugar =
+      (values.is_array() && !values.empty()) ? values[0] : values;
   return GetBool(eval, sugar, data);
 }
 

providers/flagd/src/evaluator/json_logic/numeric.cpp

@@ -178,6 +178,13 @@ class Number {
             if (rhs_val == 0) {
               return absl::InvalidArgumentError("Modulo by zero");
             }
+            if constexpr (std::is_same_v<decltype(lhs_val), int64_t> &&
+                          std::is_same_v<decltype(rhs_val), int64_t>) {
+              if (lhs_val == std::numeric_limits<int64_t>::min() &&
+                  rhs_val == -1) {
+                return Number(int64_t{0});
+              }
+            }
             return Number(lhs_val % rhs_val);
           }
         },