smithy-json 0.2.0__tar.gz → 0.2.2__tar.gz

smithy_json-0.2.2/.changes/0.2.1.json

@@ -0,0 +1,8 @@
+{
+  "changes": [
+    {
+      "type": "dependency",
+      "description": "Removed strict pinning on `smithy-core` in favor of client managed versions."
+    }
+  ]
+}

smithy_json-0.2.2/.changes/0.2.2.json

@@ -0,0 +1,8 @@
+{
+  "changes": [
+    {
+      "type": "enhancement",
+      "description": "Fixed string serialization to escape all control characters (U+0000-U+001F) per [RFC 8259](https://www.rfc-editor.org/rfc/rfc8259#section-7), preventing invalid JSON output for multiline and other control-character-containing strings. ([#647](https://github.com/smithy-lang/smithy-python/pull/647))"
+    }
+  ]
+}

smithy_json-0.2.2/CHANGELOG.md

@@ -0,0 +1,28 @@
+# Changelog
+
+## v0.2.2
+
+### Enhancements
+* Fixed string serialization to escape all control characters (U+0000-U+001F) per [RFC 8259](https://www.rfc-editor.org/rfc/rfc8259#section-7), preventing invalid JSON output for multiline and other control-character-containing strings. ([#647](https://github.com/smithy-lang/smithy-python/pull/647))
+
+## v0.2.1
+
+### Dependencies
+* Removed strict pinning on `smithy-core` in favor of client managed versions.
+
+## v0.2.0
+
+### Dependencies
+* Bump `smithy-core` from `~=0.1.0` to `~=0.2.0`.
+
+## v0.1.0
+
+### Enhancements
+* Use shared settings for JSON codec
+* Pass JSON document class through settings
+* Use natural dict ordering for member index
+
+## v0.0.1
+
+### Features
+* Added support for json primitives in Smithy clients.

{smithy_json-0.2.0 → smithy_json-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smithy-json
-Version: 0.2.0
+Version: 0.2.2
 Summary: JSON serialization and deserialization support for Smithy tooling.
 Project-URL: Changelog, https://github.com/smithy-lang/smithy-python/blob/develop/packages/smithy-json/CHANGELOG.md
 Project-URL: Code, https://github.com/smithy-lang/smithy-python/blob/develop/packages/smithy-json/
@@ -25,7 +25,7 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.12
 Requires-Dist: ijson>=3.3.0
-Requires-Dist: smithy-core~=0.2.0
+Requires-Dist: smithy-core
 Description-Content-Type: text/markdown
 
 # smithy-json

{smithy_json-0.2.0 → smithy_json-0.2.2}/pyproject.toml

@@ -27,7 +27,7 @@ classifiers = [
 ]
 dependencies = [
     "ijson>=3.3.0",
-    "smithy-core~=0.2.0",
+    "smithy-core",
 ]
 
 [project.urls]

{smithy_json-0.2.0 → smithy_json-0.2.2}/src/smithy_json/__init__.py

@@ -13,7 +13,7 @@ from ._private.documents import JSONDocument
 from ._private.serializers import JSONShapeSerializer as _JSONShapeSerializer
 from .settings import JSONSettings
 
-__version__ = "0.2.0"
+__version__ = "0.2.2"
 __all__ = ("JSONCodec", "JSONDocument", "JSONSettings")
 
 

{smithy_json-0.2.0 → smithy_json-0.2.2}/src/smithy_json/_private/serializers.py

@@ -1,6 +1,7 @@
 #  Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #  SPDX-License-Identifier: Apache-2.0
 
+import re
 from base64 import b64encode
 from collections.abc import Callable, Mapping, Sequence
 from contextlib import AbstractContextManager
@@ -27,6 +28,30 @@ from . import Flushable
 _INF: float = float("inf")
 _NEG_INF: float = float("-inf")
 
+# RFC 8259 §7: All control characters U+0000 through U+001F MUST be escaped.
+_ESCAPE_MAP: dict[str, str] = {
+    "\\": "\\\\",
+    '"': '\\"',
+    "\n": "\\n",
+    "\r": "\\r",
+    "\t": "\\t",
+    "\b": "\\b",
+    "\f": "\\f",
+}
+_CHARS_TO_ESCAPE = re.compile(r'[\\"\x00-\x1f]')
+
+
+def _escape_char(match: re.Match[str]) -> str:
+    c = match.group()
+    if c in _ESCAPE_MAP:
+        return _ESCAPE_MAP[c]
+    return f"\\u{ord(c):04x}"
+
+
+def _escape_string(value: str) -> str:
+    """Escape a string value per RFC 8259 §7."""
+    return _CHARS_TO_ESCAPE.sub(_escape_char, value)
+
 
 class JSONShapeSerializer(ShapeSerializer):
     def __init__(self, sink: BytesWriter, settings: JSONSettings) -> None:
@@ -271,9 +296,7 @@ class StreamingJSONEncoder:
 
     def write_string(self, value: str) -> None:
         self._sink.write(b'"')
-        self._sink.write(
-            value.replace("\\", "\\\\").replace('"', '\\"').encode("utf-8")
-        )
+        self._sink.write(_escape_string(value).encode("utf-8"))
         self._sink.write(b'"')
 
     def write_int(self, value: int) -> None:

smithy_json-0.2.0/CHANGELOG.md

@@ -1,18 +0,0 @@
-# Changelog
-
-## v0.2.0
-
-### Dependencies
-* Bump `smithy-core` from `~=0.1.0` to `~=0.2.0`.
-
-## v0.1.0
-
-### Enhancements
-* Use shared settings for JSON codec
-* Pass JSON document class through settings
-* Use natural dict ordering for member index
-
-## v0.0.1
-
-### Features
-* Added support for json primitives in Smithy clients.