Implement operation interfaces, because KMP can't generate correct code for iOS

core/src/commonMain/kotlin/JsonLogicEngine.kt

@@ -1,5 +1,7 @@
 import evaluation.CommonLogicEvaluator
 import evaluation.LogicOperations
+import operation.FunctionalLogicOperation
+import operation.StandardLogicOperation
 import operations.In
 import operations.Log
 import operations.array.Filter

core/src/commonMain/kotlin/evaluation/CommonLogicEvaluator.kt

@@ -1,7 +1,8 @@
 package evaluation
 
-import LogicEvaluator
 import JsonLogicException
+import LogicEvaluator
+import operation.StandardLogicOperation
 import utils.asList
 
 internal class CommonLogicEvaluator(private val operations: LogicOperations) : LogicEvaluator {
@@ -21,16 +22,16 @@ internal class CommonLogicEvaluator(private val operations: LogicOperations) : L
         val operator = logic.keys.firstOrNull()
         val values = logic[operator]
         return if (operations.functionalOperations.keys.contains(operator)) {
-            operations.functionalOperations[operator]?.invoke(values.asList, data, this)
+            operations.functionalOperations[operator]?.evaluateLogic(values.asList, data, this)
         } else {
-            operations.standardOperations.getOperation(operator).invoke(when (values) {
+            operations.standardOperations.getOperation(operator).evaluateLogic(when (values) {
                 is List<*> -> values.map { executeExpression(it, data) }
                 is Map<*, *> -> executeExpression(values, data)
                 else -> executeExpression(listOf(values), data)
-            }.asList, data)
+            }.asList,data)
         }
     }
 
-    private fun Map<String, (Any?, Any?) -> Any?>.getOperation(operator: Any?) =
+    private fun Map<String, StandardLogicOperation>.getOperation(operator: Any?) =
         get(operator) ?: throw JsonLogicException("Operation $operator not found.")
 }

core/src/commonMain/kotlin/evaluation/LogicOperations.kt

@@ -1,7 +1,7 @@
 package evaluation
 
-import FunctionalLogicOperation
-import StandardLogicOperation
+import operation.FunctionalLogicOperation
+import operation.StandardLogicOperation
 
 internal data class LogicOperations(
     val standardOperations: Map<String, StandardLogicOperation> = emptyMap(),

core/src/commonMain/kotlin/operations/In.kt

@@ -1,11 +1,11 @@
 package operations
 
-import StandardLogicOperation
+import operation.StandardLogicOperation
 import utils.asList
 import utils.secondOrNull
 
 internal object In : StandardLogicOperation {
-    override fun invoke(expression: Any?, data: Any?): Boolean {
+    override fun evaluateLogic(expression: Any?, data: Any?): Boolean? {
         val first = expression.asList.firstOrNull()
         return when (val second = expression.asList.secondOrNull()) {
             is String -> second.contains(first.toString())

core/src/commonMain/kotlin/operations/Log.kt

@@ -1,10 +1,10 @@
 package operations
 
-import StandardLogicOperation
+import operation.StandardLogicOperation
 import utils.asList
 
 internal class Log(private val logger: ((Any?) -> Unit)? = null) : StandardLogicOperation {
-    override fun invoke(expression: Any?, data: Any?): Any? {
+    override fun evaluateLogic(expression: Any?, data: Any?): Any? {
         val loggedValue = expression.asList.firstOrNull()
         logger?.let { log -> log(loggedValue) }
         return loggedValue

core/src/commonMain/kotlin/operations/array/Filter.kt

@@ -1,12 +1,12 @@
 package operations.array
 
 import LogicEvaluator
-import FunctionalLogicOperation
+import operation.FunctionalLogicOperation
 import operations.logic.unwrap.TruthyUnwrapStrategy
 import kotlin.collections.Map
 
 internal object Filter : FunctionalLogicOperation, NoInitialValueOperation, TruthyUnwrapStrategy {
-    override fun invoke(expression: Any?, data: Any?, evaluator: LogicEvaluator): Any? =
+    override fun evaluateLogic(expression: Any?, data: Any?, evaluator: LogicEvaluator): Any? =
         invokeArrayOperation(expression, data, evaluator, ::filterOrEmptyList)
 
     private fun filterOrEmptyList(

core/src/commonMain/kotlin/operations/array/Map.kt

@@ -1,11 +1,11 @@
 package operations.array
 
 import LogicEvaluator
-import FunctionalLogicOperation
+import operation.FunctionalLogicOperation
 import kotlin.collections.Map
 
 internal object Map : FunctionalLogicOperation, NoInitialValueOperation {
-    override fun invoke(expression: Any?, data: Any?, evaluator: LogicEvaluator): Any? =
+    override fun evaluateLogic(expression: Any?, data: Any?, evaluator: LogicEvaluator): Any? =
         invokeArrayOperation(expression, data, evaluator, ::mapOrEmptyList)
 
     private fun mapOrEmptyList(

core/src/commonMain/kotlin/operations/array/Merge.kt

@@ -1,10 +1,10 @@
 package operations.array
 
-import StandardLogicOperation
+import operation.StandardLogicOperation
 import utils.asList
 
 internal object Merge : StandardLogicOperation {
-    override fun invoke(expression: Any?, data: Any?): Any = expression.asList.mergeOrAdd()
+    override fun evaluateLogic(expression: Any?, data: Any?): Any = expression.asList.mergeOrAdd()
 
     private fun List<Any?>.mergeOrAdd(): List<Any?> = flatMap {
         when (it) {

core/src/commonMain/kotlin/operations/array/Reduce.kt

@@ -1,7 +1,7 @@
 package operations.array
 
 import LogicEvaluator
-import FunctionalLogicOperation
+import operation.FunctionalLogicOperation
 import utils.asList
 import utils.thirdOrNull
 import kotlin.collections.Map
@@ -10,7 +10,7 @@ internal object Reduce : FunctionalLogicOperation, ArrayOperation {
     private const val CURRENT_DATA_KEY = "current"
     private const val ACCUMULATOR_DATA_KEY = "accumulator"
 
-    override fun invoke(expression: Any?, data: Any?, evaluator: LogicEvaluator): Any? =
+    override fun evaluateLogic(expression: Any?, data: Any?, evaluator: LogicEvaluator): Any? =
         expression.asList.let { expressionValues ->
             val input = createOperationInput(expressionValues, data, evaluator)
             val initialValue = expressionValues.thirdOrNull()

core/src/commonMain/kotlin/operations/array/occurence/All.kt

@@ -1,10 +1,10 @@
 package operations.array.occurence
 
 import LogicEvaluator
-import FunctionalLogicOperation
+import operation.FunctionalLogicOperation
 
 internal object All : FunctionalLogicOperation, OccurrenceCheckOperation {
-    override fun invoke(expression: Any?, data: Any?, evaluator: LogicEvaluator): Any? =
+    override fun evaluateLogic(expression: Any?, data: Any?, evaluator: LogicEvaluator): Any? =
         checkOccurrence(expression, data, evaluator)
 
     override fun check(

core/src/commonMain/kotlin/operations/array/occurence/None.kt

@@ -1,11 +1,10 @@
 package operations.array.occurence
 
 import LogicEvaluator
-import FunctionalLogicOperation
-import kotlin.collections.Map
+import operation.FunctionalLogicOperation
 
 internal object None : FunctionalLogicOperation, OccurrenceCheckOperation {
-    override fun invoke(expression: Any?, data: Any?, evaluator: LogicEvaluator): Any? =
+    override fun evaluateLogic(expression: Any?, data: Any?, evaluator: LogicEvaluator): Any? =
         checkOccurrence(expression, data, evaluator)
 
     override fun getOperationDefault(mappingOperation: Map<String, Any>?, expressionValues: List<Any?>) = true

core/src/commonMain/kotlin/operations/array/occurence/Some.kt

@@ -1,10 +1,10 @@
 package operations.array.occurence
 
 import LogicEvaluator
-import FunctionalLogicOperation
+import operation.FunctionalLogicOperation
 
 internal object Some : FunctionalLogicOperation, OccurrenceCheckOperation {
-    override fun invoke(expression: Any?, data: Any?, evaluator: LogicEvaluator): Any? =
+    override fun evaluateLogic(expression: Any?, data: Any?, evaluator: LogicEvaluator): Any? =
         checkOccurrence(expression, data, evaluator)
 
     override fun check(

core/src/commonMain/kotlin/operations/data/Missing.kt

@@ -1,11 +1,11 @@
 package operations.data
 
-import StandardLogicOperation
+import operation.StandardLogicOperation
 
 internal object Missing : StandardLogicOperation {
-    override fun invoke(expression: Any?, data: Any?): List<Any?> {
+    override fun evaluateLogic(expression: Any?, data: Any?): List<Any?> {
         return (expression as? List<Any?>)?.mapNotNull {
-            it.takeIf { Var(it, data).isNullOrEmptyString() }
+            it.takeIf { Var.evaluateLogic(it, data).isNullOrEmptyString() }
         }.orEmpty()
     }
 

core/src/commonMain/kotlin/operations/data/MissingSome.kt

@@ -1,14 +1,14 @@
 package operations.data
 
-import StandardLogicOperation
+import operation.StandardLogicOperation
 import utils.longOrZero
 import utils.secondOrNull
 
 internal object MissingSome : StandardLogicOperation {
-    override fun invoke(expression: Any?, data: Any?): Any {
+    override fun evaluateLogic(expression: Any?, data: Any?): Any {
         val min = (expression as? List<Any?>?)?.firstOrNull()?.toString()?.longOrZero ?: 0
         val keys = ((expression as? List<Any?>?)?.secondOrNull() as? List<Any?>).orEmpty()
-        val missing = Missing(keys, data)
+        val missing = Missing.evaluateLogic(keys, data)
         return missing.takeIf { keys.size - missing.size < min }.orEmpty()
     }
 }

core/src/commonMain/kotlin/operations/data/Var.kt

@@ -1,12 +1,12 @@
 package operations.data
 
-import StandardLogicOperation
+import operation.StandardLogicOperation
 import operations.data.unwrap.ValueFetchingUnwrapStrategy
 import utils.intOrZero
 import utils.secondOrNull
 
 internal object Var : StandardLogicOperation, ValueFetchingUnwrapStrategy {
-    override operator fun invoke(expression: Any?, data: Any?): Any? =
+    override fun evaluateLogic(expression: Any?, data: Any?): Any? =
         unwrapDataKeys(expression)?.fetchValueOrDefault(expression, data)
 
     private fun List<String>.fetchValueOrDefault(expression: Any?, data: Any?): Any? {

core/src/commonMain/kotlin/operations/logic/And.kt

@@ -1,12 +1,11 @@
 package operations.logic
 
-import StandardLogicOperation
+import operation.StandardLogicOperation
 import operations.logic.unwrap.TruthyUnwrapStrategy
 import utils.asList
 
 internal object And : StandardLogicOperation, TruthyUnwrapStrategy {
-
-    override fun invoke(expression: Any?, data: Any?) = with(expression.asList) {
+    override fun evaluateLogic(expression: Any?, data: Any?) = with(expression.asList) {
         if (all { it is Boolean }) {
             all { unwrapValueAsBoolean(it) }
         } else {

core/src/commonMain/kotlin/operations/logic/DoubleNegation.kt

@@ -1,9 +1,12 @@
 package operations.logic
 
-import StandardLogicOperation
+import operation.StandardLogicOperation
 import operations.logic.unwrap.TruthyUnwrapStrategy
 import utils.asList
 
 internal object DoubleNegation : StandardLogicOperation, TruthyUnwrapStrategy {
-    override fun invoke(expression: Any?, data: Any?): Boolean = unwrapValueAsBoolean(expression.asList.firstOrNull())
+    override fun evaluateLogic(
+        expression: Any?,
+        data: Any?
+    ): Boolean = unwrapValueAsBoolean(expression.asList.firstOrNull())
 }

core/src/commonMain/kotlin/operations/logic/Equals.kt

@@ -1,9 +1,9 @@
 package operations.logic
 
-import StandardLogicOperation
+import operation.StandardLogicOperation
 
 internal object Equals : StandardLogicOperation, EqualsOperation {
-    override fun invoke(
+    override fun evaluateLogic(
         expression: Any?,
         data: Any?
     ): Boolean = compare(expression) { first, second -> first == second }

core/src/commonMain/kotlin/operations/logic/If.kt

@@ -1,14 +1,14 @@
 package operations.logic
 
-import StandardLogicOperation
+import operation.StandardLogicOperation
 import operations.logic.unwrap.TruthyUnwrapStrategy
 import utils.asList
 import utils.secondOrNull
 import utils.thirdOrNull
 
 @Suppress("MagicNumber")
 internal object If : StandardLogicOperation, TruthyUnwrapStrategy {
-    override fun invoke(expression: Any?, data: Any?): Any? = expression.asList.recursiveIf()
+    override fun evaluateLogic(expression: Any?, data: Any?): Any? = expression.asList.recursiveIf()
 
     private fun List<Any?>.recursiveIf(): Any? = when (size) {
         0 -> null

core/src/commonMain/kotlin/operations/logic/Negation.kt

@@ -1,9 +1,12 @@
 package operations.logic
 
-import StandardLogicOperation
+import operation.StandardLogicOperation
 import operations.logic.unwrap.TruthyUnwrapStrategy
 import utils.asList
 
 internal object Negation : StandardLogicOperation, TruthyUnwrapStrategy {
-    override fun invoke(expression: Any?, data: Any?): Boolean = !unwrapValueAsBoolean(expression.asList.firstOrNull())
+    override fun evaluateLogic(
+        expression: Any?,
+        data: Any?
+    ): Boolean = !unwrapValueAsBoolean(expression.asList.firstOrNull())
 }

core/src/commonMain/kotlin/operations/logic/NotEquals.kt

@@ -1,9 +1,9 @@
 package operations.logic
 
-import StandardLogicOperation
+import operation.StandardLogicOperation
 
 internal object NotEquals : StandardLogicOperation, EqualsOperation {
-    override fun invoke(
+    override fun evaluateLogic(
         expression: Any?,
         data: Any?
     ): Boolean = !compare(expression) { first, second -> first == second }

core/src/commonMain/kotlin/operations/logic/NotStrictEquals.kt

@@ -1,9 +1,9 @@
 package operations.logic
 
-import StandardLogicOperation
+import operation.StandardLogicOperation
 
 internal object NotStrictEquals : StandardLogicOperation, StrictEqualsOperation {
-    override fun invoke(expression: Any?, data: Any?): Boolean =
+    override fun evaluateLogic(expression: Any?, data: Any?): Boolean =
         !compare(expression) { first, second -> first == second }
 }
 

core/src/commonMain/kotlin/operations/logic/Or.kt

@@ -1,11 +1,11 @@
 package operations.logic
 
-import StandardLogicOperation
+import operation.StandardLogicOperation
 import operations.logic.unwrap.TruthyUnwrapStrategy
 import utils.asList
 
 internal object Or : StandardLogicOperation, TruthyUnwrapStrategy {
-    override fun invoke(expression: Any?, data: Any?) = with(expression.asList) {
+    override fun evaluateLogic(expression: Any?, data: Any?) = with(expression.asList) {
         if (all { it is Boolean }) {
             firstOrNull { unwrapValueAsBoolean(it) } != null
         } else {

core/src/commonMain/kotlin/operations/logic/StrictEquals.kt

@@ -1,12 +1,10 @@
 package operations.logic
 
-import StandardLogicOperation
+import operation.StandardLogicOperation
 
 internal object StrictEquals : StandardLogicOperation, StrictEqualsOperation {
-    override fun invoke(
-        expression: Any?,
-        data: Any?
-    ): Boolean = compare(expression) { first, second -> first == second }
+    override fun evaluateLogic(expression: Any?, data: Any?): Boolean =
+        compare(expression) { first, second -> first == second }
 }
 
 

core/src/commonMain/kotlin/operations/numeric/Addition.kt

@@ -1,9 +1,11 @@
 package operations.numeric
 
-import StandardLogicOperation
+import operation.StandardLogicOperation
 import operations.numeric.unwrap.StrictUnwrapStrategy
 
 internal object Addition : StandardLogicOperation, DoubleTypeSensitiveOperation, StrictUnwrapStrategy {
-
-    override fun invoke(expression: Any?, data: Any?): Any? = doubleResultOrNull(unwrapValue(expression)) { it.sum() }
+    override fun evaluateLogic(
+        expression: Any?,
+        data: Any?
+    ): Any? = doubleResultOrNull(unwrapValue(expression)) { it.sum() }
 }

core/src/commonMain/kotlin/operations/numeric/Division.kt

@@ -1,10 +1,10 @@
 package operations.numeric
 
-import StandardLogicOperation
+import operation.StandardLogicOperation
 import operations.numeric.unwrap.LenientUnwrapStrategy
 
 internal object Division : StandardLogicOperation, LenientUnwrapStrategy {
-    override fun invoke(expression: Any?, data: Any?) =
+    override fun evaluateLogic(expression: Any?, data: Any?) =
         unwrapValueAsDouble(expression).takeIf { it.size >= 2 }?.let {
             val second = it[1]
             val first = it.first()

core/src/commonMain/kotlin/operations/numeric/Max.kt

@@ -1,7 +1,7 @@
 package operations.numeric
 
-import StandardLogicOperation
+import operation.StandardLogicOperation
 
 internal object Max : StandardLogicOperation, DoubleTypeSensitiveOperation {
-    override fun invoke(expression: Any?, data: Any?): Any? = doubleResultOrNull(expression) { it.maxOrNull() }
+    override fun evaluateLogic(expression: Any?, data: Any?): Any? = doubleResultOrNull(expression) { it.maxOrNull() }
 }

core/src/commonMain/kotlin/operations/numeric/Min.kt

@@ -1,7 +1,7 @@
 package operations.numeric
 
-import StandardLogicOperation
+import operation.StandardLogicOperation
 
 internal object Min : StandardLogicOperation, DoubleTypeSensitiveOperation {
-    override fun invoke(expression: Any?, data: Any?): Any? = doubleResultOrNull(expression) { it.minOrNull() }
+    override fun evaluateLogic(expression: Any?, data: Any?): Any? = doubleResultOrNull(expression) { it.minOrNull() }
 }