Skip to content

Commit 589cad7

Browse files
Merge pull request #2 from KoloInDaCrib/fine-ass-arrays
[ENHANCEMENT] Encode arrays with newline only with dynamic objects
2 parents a8c26f1 + d447b1f commit 589cad7

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

src/json2object/writer/DataBuilder.hx

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,21 @@ class DataBuilder {
8080
var valueWriter = new $cls(ignoreNullOptionals);
8181

8282
@:privateAccess {
83-
var values = [for (element in o) valueWriter._write(element, space, level + 1, true, onAllOptionalNull)];
84-
var newLine = (space != '' && o.length > 0) ? '\n' : '';
83+
var hasDynamic:Bool = false;
84+
for (e in o)
85+
{
86+
if (Type.typeof(e) == TObject)
87+
{
88+
hasDynamic = true;
89+
break;
90+
}
91+
}
8592

93+
var values = [for (element in o) valueWriter._write(element, hasDynamic ? space : '', level + 1, true, onAllOptionalNull)];
94+
var newLine = (space != '' && o.length > 0 && hasDynamic) ? '\n' : '';
8695
var json = firstIndent + "[" + newLine;
87-
json += values.join(',' + newLine) + newLine;
88-
json += indent + "]";
96+
json += values.join(',' + (!hasDynamic ? ' ' : newLine)) + newLine;
97+
json += (hasDynamic ? indent : '') + "]";
8998
return json;
9099
}
91100
};

0 commit comments

Comments
 (0)