Make serialization of integer keys consistent with JSON.stringify() in JS

Author: thekid

ChangeLog.md

@@ -5,6 +5,8 @@ JSON for the XP Framework ChangeLog
 
 ## 6.0.0 / ????-??-??
 
+* Made serialization of integer keys consistent with `JSON.stringify()`
+  (@thekid)
 * Merged PR #16: Return `{}` as empty object instead of empty array
   (@thekid)
 

src/main/php/text/json/Format.class.php

@@ -1,6 +1,6 @@
 <?php namespace text\json;
 
-use StdClass;
+use StdClass, Traversable;
 use lang\{IllegalArgumentException, Value};
 
 /**
@@ -81,52 +81,75 @@ public function close($token) {
    * @return string
    */
   public function representationOf($value) {
-    $t= gettype($value);
-    if ('string' === $t) {
-      return json_encode($value, $this->options);
-    } else if ('integer' === $t) {
-      return (string)$value;
-    } else if ('double' === $t) {
+    $r= '';
+    foreach ($this->tokensOf($value) as $bytes) {
+      $r.= $bytes;
+    }
+    return $r;
+  }
+
+  /**
+   * Yields tokens for a given value
+   *
+   * @param  var $value
+   * @return iterable
+   */
+  public function tokensOf($value) {
+    if (is_string($value)) {
+      yield json_encode($value, $this->options);
+    } else if (is_int($value)) {
+      yield (string)$value;
+    } else if (is_float($value)) {
       $cast= (string)$value;
-      return strpos($cast, '.') ? $cast : $cast.'.0';
-    } else if ('array' === $t) {
+      yield strpos($cast, '.') ? $cast : $cast.'.0';
+    } else if (is_array($value)) {
       if (empty($value)) {
-        return '[]';
+        yield '[]';
       } else if (0 === key($value)) {
-        $r= $this->open('[');
-        $next= false;
+        yield $this->open('[');
+        $i= 0;
         foreach ($value as $element) {
-          if ($next) {
-            $r.= $this->comma;
-          } else {
-            $next= true;
-          }
-          $r.= $this->representationOf($element);
+          if ($i++) yield $this->comma;
+          yield from $this->tokensOf($element);
         }
-        return $r.$this->close(']');
-      } else { map:
-        $r= $this->open('{');
-        $next= false;
-        foreach ($value as $key => $mapped) {
-          if ($next) {
-            $r.= $this->comma;
-          } else {
-            $next= true;
-          }
-          $r.= $this->representationOf($key).$this->colon.$this->representationOf($mapped);
+        yield $this->close(']');
+      } else {
+        map: yield $this->open('{');
+        $i= 0;
+        foreach ($value as $key => $element) {
+          if ($i++) yield $this->comma;
+          yield from $this->tokensOf((string)$key);
+          yield $this->colon;
+          yield from $this->tokensOf($element);
         }
-        return $r.$this->close('}');
+        yield $this->close('}');
       }
     } else if (null === $value) {
-      return 'null';
+      yield 'null';
     } else if (true === $value) {
-      return 'true';
+      yield 'true';
     } else if (false === $value) {
-      return 'false';
-    } else if ($value instanceof StdClass) {
-      $value= (array)$value;
-      if (empty($value)) return '{}';
+      yield 'false';
+    } else if ($value instanceof JsonObject || $value instanceof StdClass) {
       goto map;
+    } else if ($value instanceof Traversable) {
+      $i= 0;
+      $map= null;
+      foreach ($value as $key => $element) {
+        if (0 === $i++) {
+          $map= 0 !== $key;
+          yield $this->open($map ? '{' : '[');
+        } else {
+          yield $this->comma;
+        }
+
+        if ($map) {
+          yield from $this->tokensOf((string)$key);
+          yield $this->colon;
+        }
+        yield from $this->tokensOf($element);
+      }
+      yield null === $map ? '[]' : $this->close($map ? '}' : ']');
     } else {
       throw new IllegalArgumentException('Cannot represent instances of '.typeof($value));
     }

src/main/php/text/json/Output.class.php

@@ -1,6 +1,5 @@
 <?php namespace text\json;
 
-use Traversable;
 use lang\{IllegalArgumentException, Value};
 
 abstract class Output implements Value {
@@ -22,30 +21,8 @@ public function __construct($format= null) {
    * @return self
    */
   public function write($value) {
-    $f= $this->format;
-    if ($value instanceof Traversable || is_array($value)) {
-      $i= 0;
-      $map= null;
-      foreach ($value as $key => $element) {
-        if (0 === $i++) {
-          $map= 0 !== $key;
-          $this->appendToken($f->open($map ? '{' : '['));
-        } else {
-          $this->appendToken($f->comma);
-        }
-
-        if ($map) {
-          $this->appendToken($f->representationOf((string)$key).$f->colon);
-        }
-        $this->write($element);
-      }
-      if (null === $map) {
-        $this->appendToken('[]');
-      } else {
-        $this->appendToken($f->close($map ? '}' : ']'));
-      }
-    } else {
-      $this->appendToken($f->representationOf($value));
+    foreach ($this->format->tokensOf($value) as $token) {
+      $this->appendToken($token);
     }
     return $this;
   }

src/test/php/text/json/unittest/JsonOutputTest.class.php

@@ -118,12 +118,12 @@ public function write_empty_object() {
 
   #[Test]
   public function write_array_as_object() {
-    Assert::equals('{0:1,1:2,2:3}', $this->write((object)[1, 2, 3]));
+    Assert::equals('{"0":1,"1":2,"2":3}', $this->write((object)[1, 2, 3]));
   }
 
   #[Test]
   public function write_nested_array_as_object() {
-    Assert::equals('{"values":{0:1,1:2,2:3}}', $this->write(['values' => (object)[1, 2, 3]]));
+    Assert::equals('{"values":{"0":1,"1":2,"2":3}}', $this->write(['values' => (object)[1, 2, 3]]));
   }
 
   #[Test]