Fix tests

Author: abnegate

templates/php/src/Operator.php.twig

@@ -36,10 +36,11 @@ class Operator implements \JsonSerializable
 
     public function jsonSerialize(): mixed
     {
-        return array_filter([
-            'method' => $this->method,
-            'values' => $this->values,
-        ]);
+        $result = ['method' => $this->method];
+        if ($this->values !== null) {
+            $result['values'] = $this->values;
+        }
+        return $result;
     }
 
     /**

templates/ruby/lib/container.rb.twig

@@ -11,6 +11,7 @@ require_relative '{{ spec.title | caseSnake }}/query'
 require_relative '{{ spec.title | caseSnake }}/permission'
 require_relative '{{ spec.title | caseSnake }}/role'
 require_relative '{{ spec.title | caseSnake }}/id'
+require_relative '{{ spec.title | caseSnake }}/operator'
 
 {% for defintion in spec.definitions %}
 require_relative '{{ spec.title | caseSnake }}/models/{{ defintion.name | caseSnake }}'

templates/ruby/lib/container/operator.rb.twig

@@ -25,10 +25,9 @@ module {{spec.title | caseUcfirst}}
         end
 
         def to_json(*args)
-            {
-                method: @method,
-                values: @values
-            }.compact.to_json(*args)
+            result = { method: @method }
+            result[:values] = @values unless @values.nil?
+            result.to_json(*args)
         end
 
         def to_s

templates/swift/Sources/Operator.swift.twig

@@ -77,8 +77,13 @@ public struct Operator : Codable, CustomStringConvertible {
     }
 
     private static func convertToOperatorValueArray(_ values: Any?) -> [OperatorValue]? {
-        // Handle nil or NSNull as [.null]
-        if values == nil || values is NSNull {
+        // Handle nil
+        if values == nil {
+            return nil
+        }
+
+        // Handle NSNull as [.null]
+        if values is NSNull {
             return [.null]
         }
 

tests/languages/apple/Tests.swift

@@ -262,12 +262,12 @@ class Tests: XCTestCase {
         print(Operator.power(3, max: 100))
         print(Operator.arrayAppend(["item1", "item2"]))
         print(Operator.arrayPrepend(["first", "second"]))
-        print(Operator.arrayInsert(0, "newItem"))
+        print(Operator.arrayInsert(0, value: "newItem"))
         print(Operator.arrayRemove("oldItem"))
         print(Operator.arrayUnique())
         print(Operator.arrayIntersect(["a", "b", "c"]))
         print(Operator.arrayDiff(["x", "y"]))
-        print(Operator.arrayFilter(Condition.equal, "test"))
+        print(Operator.arrayFilter(Condition.equal, value: "test"))
         print(Operator.concat("suffix"))
         print(Operator.replace("old", "new"))
         print(Operator.toggle())

tests/languages/dotnet/Tests.cs

@@ -237,13 +237,13 @@ public async Task Test1()
             TestContext.WriteLine(Operator.Modulo(5));
             TestContext.WriteLine(Operator.Power(2));
             TestContext.WriteLine(Operator.Power(3, 100));
-            TestContext.WriteLine(Operator.ArrayAppend(new List<string> { "item1", "item2" }));
-            TestContext.WriteLine(Operator.ArrayPrepend(new List<string> { "first", "second" }));
+            TestContext.WriteLine(Operator.ArrayAppend(new List<object> { "item1", "item2" }));
+            TestContext.WriteLine(Operator.ArrayPrepend(new List<object> { "first", "second" }));
             TestContext.WriteLine(Operator.ArrayInsert(0, "newItem"));
             TestContext.WriteLine(Operator.ArrayRemove("oldItem"));
             TestContext.WriteLine(Operator.ArrayUnique());
-            TestContext.WriteLine(Operator.ArrayIntersect(new List<string> { "a", "b", "c" }));
-            TestContext.WriteLine(Operator.ArrayDiff(new List<string> { "x", "y" }));
+            TestContext.WriteLine(Operator.ArrayIntersect(new List<object> { "a", "b", "c" }));
+            TestContext.WriteLine(Operator.ArrayDiff(new List<object> { "x", "y" }));
             TestContext.WriteLine(Operator.ArrayFilter(Condition.Equal, "test"));
             TestContext.WriteLine(Operator.Concat("suffix"));
             TestContext.WriteLine(Operator.Replace("old", "new"));