JsonString a bit better validation and docs.

LastDragon-ru · Sep 15, 2023 · a54cdd3 · a54cdd3
1 parent 298f375
commit a54cdd3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/packages/graphql/docs/Scalars/JsonString.md b/packages/graphql/docs/Scalars/JsonString.md
@@ -2,4 +2,12 @@
 
 Represents [JSON](https://json.org) string.
 
-Please note that the scalar doesn't encode/decode value to/from JSON, it just contains a valid JSON string. Consider using `JSON` type from [`mll-lab/graphql-php-scalars`](https://github.com/mll-lab/graphql-php-scalars) package if you need a conversion.
+Please note that the scalar doesn't encode/decode value to/from JSON, it just contains a valid JSON string. If you want automatically convert value to/from JSON, you can use the `JSON` type from [`mll-lab/graphql-php-scalars`](https://github.com/mll-lab/graphql-php-scalars) package. If you need something more typesafe, consider using [`Serializer`][pkg:serializer].
+
+[include:file]: ../../../../docs/shared/Links.md
+[//]: # (start: a170145c7adc0561ead408b0ea3a4b46e2e8f45ebc2744984ceb8c1b49822cd1)
+[//]: # (warning: Generated automatically. Do not edit.)
+
+[pkg:serializer]:      https://github.com/LastDragon-ru/lara-asp/tree/main/packages/serializer
+
+[//]: # (end: a170145c7adc0561ead408b0ea3a4b46e2e8f45ebc2744984ceb8c1b49822cd1)
diff --git a/packages/graphql/src/Scalars/JsonString.php b/packages/graphql/src/Scalars/JsonString.php
@@ -28,7 +28,13 @@ class JsonString extends StringType implements TypeDefinition {
     // <editor-fold desc="ScalarType">
     // =========================================================================
     public function serialize(mixed $value): string {
-        return $this->validate($value, InvariantViolation::class);
+        if ($value instanceof JsonStringable) {
+            $value = (string) $value;
+        } else {
+            $value = $this->validate($value, InvariantViolation::class);
+        }
+
+        return $value;
     }
 
     public function parseValue(mixed $value): string {
@@ -49,7 +55,7 @@ public function parseLiteral(Node $valueNode, array $variables = null): string {
             );
         }
 
-        return $this->validate($valueNode->value, Error::class);
+        return $this->parseValue($valueNode->value);
     }
 
     /**
@@ -60,8 +66,6 @@ public function parseLiteral(Node $valueNode, array $variables = null): string {
     protected function validate(mixed $value, string $error): string {
         if (is_string($value) && json_validate($value)) {
             // ok
-        } elseif ($value instanceof JsonStringable) {
-            $value = (string) $value;
         } else {
             throw new $error(
                 sprintf(