fix(logic): fix empty array management in json predicate

axone-protocol · Jun 25, 2023 · 054f854 · 054f854
1 parent 10022d0
commit 054f854
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/x/logic/predicate/atom.go b/x/logic/predicate/atom.go
@@ -22,6 +22,9 @@ var AtomTrue = engine.NewAtom("true")
 // AtomFalse is the term false.
 var AtomFalse = engine.NewAtom("false")
 
+// AtomEmptyArray is the term [].
+var AtomEmptyArray = engine.NewAtom("[]")
+
 // AtomNull is the term null.
 var AtomNull = engine.NewAtom("null")
 
@@ -39,3 +42,9 @@ func MakeBool(b bool) engine.Term {
 
 	return AtomAt.Apply(AtomFalse)
 }
+
+// MakeEmptyArray returns is the compound term @([]).
+// It is used to represent the empty array in json objects.
+func MakeEmptyArray() engine.Term {
+	return AtomAt.Apply(AtomEmptyArray)
+}
diff --git a/x/logic/predicate/json.go b/x/logic/predicate/json.go
@@ -126,6 +126,8 @@ func termsToJSON(term engine.Term, env *engine.Env) ([]byte, error) {
 			return json.Marshal(true)
 		case MakeBool(false).Compare(t, env) == 0:
 			return json.Marshal(false)
+		case MakeEmptyArray().Compare(t, env) == 0:
+			return json.Marshal([]json.RawMessage{})
 		case MakeNull().Compare(t, env) == 0:
 			return json.Marshal(nil)
 		}
@@ -168,6 +170,10 @@ func jsonToTerms(value any) (engine.Term, error) {
 		return AtomJSON.Apply(engine.List(attributes...)), nil
 	case []any:
 		elements := make([]engine.Term, 0, len(v))
+		if len(v) == 0 {
+			return MakeEmptyArray(), nil
+		}
+
 		for _, element := range v {
 			term, err := jsonToTerms(element)
 			if err != nil {