added JsonSerializable

Author: astral-data

src/Serialize.php

@@ -50,11 +50,7 @@ public function toJsonString(): bool|string
 
     public function withoutResponseToJsonString(): string
     {
-        if ($this->getContext() === null) {
-            $this->setContext(ContextFactory::build(static::class));
-        }
-
-        return json_encode($this->getContext()->toArrayWithoutResponse($this->toArray()));
+        return json_encode($this->toArray());
     }
 
     public function toArray(): array
@@ -107,15 +103,15 @@ public function jsonSerialize(): array
             $resultData = [];
             foreach ($responses as $field => $item){
                 if($item === 'T'){
-                    $resultData[$field] = $this->getContext()->toArrayWithoutResponse($this->toArray());
+                    $resultData[$field] = $this->toArray();
                 }else{
                     $resultData[$field] = $item['value'] ?? ($item['example'] ?? '');
                 }
             }
             return $resultData;
         }
 
-        return $this->getContext()->toArrayWithoutResponse($this->toArray());
+        return $this->toArray();
     }
 
     public function __call(string $name, array $arguments)

src/Support/Context/SerializeContext.php

@@ -211,7 +211,6 @@ className: $type->className,
      */
     public function from(mixed ...$payload): object
     {
-
         $payloads = [];
         foreach ($payload as $field => $itemPayload) {
             $itemPayload = $this->normalizerCastResolver->resolve($itemPayload);
@@ -247,17 +246,4 @@ public function toArray(object $object): array
         return $this->propertyToArrayResolver->resolve($this->chooseSerializeContext, $this->getGroupCollection(), $object);
     }
 
-    public function toArrayWithoutResponse($data)
-    {
-        if ($data instanceof Serialize) {
-            return get_object_vars($data);
-        } elseif (is_array($data)) {
-            foreach ($data as $key => $value) {
-                $data[$key] = $this->toArrayWithoutResponse($value);
-            }
-            return $data;
-        }
-        return $data;
-    }
-
 }

tests/Serialize/From/NormalizerFromSerializeTest.php

@@ -1,5 +1,7 @@
 <?php
 
+use Astral\Serialize\Annotations\DataCollection\InputName;
+use Astral\Serialize\Annotations\DataCollection\OutputName;
 use Astral\Serialize\Serialize;
 
 beforeAll(function () {
@@ -12,6 +14,9 @@ class NormalizerOne extends Serialize
     class NormalizerTwo extends Serialize
     {
         public string $name_two;
+
+        #[InputName('id_2')]
+        #[OutputName('id_2')]
         public int $id_two;
     }
 
@@ -47,7 +52,7 @@ class NormalizerClass extends Serialize
             'name_one' => 'one name',
             'id_one' => 1
         ]);
-
+//
 
 });
 
@@ -62,22 +67,23 @@ class NormalizerClass extends Serialize
     $normalizerTwo->id_two = 2;
 
     $res = NormalizerClass::from(one: $normalizerOne, two: $normalizerTwo, three: $normalizerOne);
+
     $resJson = json_encode($res);
-    expect($resJson)->toBe('{"code":200,"message":"\u64cd\u4f5c\u6210\u529f","data":{"one":{"name_one":"one name","id_one":1},"two":{"name_two":"two name","id_two":2},"three":{"name_one":"one name","id_one":1}}}');
+    expect($resJson)->toBe('{"code":200,"message":"\u64cd\u4f5c\u6210\u529f","data":{"one":{"name_one":"one name","id_one":1},"two":{"name_two":"two name","id_2":2},"three":{"name_one":"one name","id_one":1}}}');
 
     $res->setMessage('233');
     $resJson = json_encode($res);
-    expect($resJson)->toBe('{"code":200,"message":"233","data":{"one":{"name_one":"one name","id_one":1},"two":{"name_two":"two name","id_two":2},"three":{"name_one":"one name","id_one":1}}}');
+    expect($resJson)->toBe('{"code":200,"message":"233","data":{"one":{"name_one":"one name","id_one":1},"two":{"name_two":"two name","id_2":2},"three":{"name_one":"one name","id_one":1}}}');
 
     $res->setCode(-1);
     $resJson = json_encode($res);
-    expect($resJson)->toBe('{"code":-1,"message":"233","data":{"one":{"name_one":"one name","id_one":1},"two":{"name_two":"two name","id_two":2},"three":{"name_one":"one name","id_one":1}}}');
+    expect($resJson)->toBe('{"code":-1,"message":"233","data":{"one":{"name_one":"one name","id_one":1},"two":{"name_two":"two name","id_2":2},"three":{"name_one":"one name","id_one":1}}}');
 
     $resJson = $res->withoutResponseToJsonString();
-    expect($resJson)->toBe('{"one":{"name_one":"one name","id_one":1},"two":{"name_two":"two name","id_two":2},"three":{"name_one":"one name","id_one":1}}');
+    var_dump($resJson);
+    expect($resJson)->toBe('{"one":{"name_one":"one name","id_one":1},"two":{"name_two":"two name","id_2":2},"three":{"name_one":"one name","id_one":1}}');
 
     $resJson = $res->toJsonString();
-    expect($resJson)->toBe('{"code":-1,"message":"233","data":{"one":{"name_one":"one name","id_one":1},"two":{"name_two":"two name","id_two":2},"three":{"name_one":"one name","id_one":1}}}');
-
-});
+    expect($resJson)->toBe('{"code":-1,"message":"233","data":{"one":{"name_one":"one name","id_one":1},"two":{"name_two":"two name","id_2":2},"three":{"name_one":"one name","id_one":1}}}');
 
+});