VariantImpl: add toArrayIfNull() and toObjectIfNull()

MsgPackSerializer: use iterators to serialize array and objects
JsonSerializer: use iterators to serialize array and objects
2025-12-23 15:08:08 +01:00 · 2025-07-24 18:40:38 +02:00 · 2025-07-23 16:31:19 +02:00 · 2025-07-23 16:14:03 +02:00 · 2025-07-20 18:23:03 +02:00 · 2025-07-20 14:56:06 +02:00
377 changed files with 2589 additions and 2431 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -93,44 +93,40 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - clang: "3.9"
-            runner: ubuntu-20.04
-            archive: bionic
-          - clang: "4.0"
-            runner: ubuntu-20.04
-            archive: bionic
-          - clang: "5.0"
-            runner: ubuntu-20.04
-            archive: bionic
-          - clang: "6.0"
-            runner: ubuntu-20.04
-            archive: bionic
          - clang: "7"
-            runner: ubuntu-20.04
+            runner: ubuntu-22.04
+            archive: focal
          - clang: "8"
            cxxflags: -fsanitize=leak -fno-sanitize-recover=all
-            runner: ubuntu-20.04
+            runner: ubuntu-22.04
+            archive: focal
          - clang: "9"
            cxxflags: -fsanitize=undefined -fno-sanitize-recover=all
-            runner: ubuntu-20.04
+            runner: ubuntu-22.04
+            archive: focal
          - clang: "10"
            cxxflags: -fsanitize=address -fno-sanitize-recover=all
-            runner: ubuntu-20.04
+            runner: ubuntu-22.04
+            archive: focal
          - clang: "11"
            runner: ubuntu-22.04
          - clang: "12"
            runner: ubuntu-22.04
          - clang: "13"
            runner: ubuntu-22.04
-          - clang: "14"
-            runner: ubuntu-22.04
-          - clang: "15"
-            runner: ubuntu-22.04
-    runs-on: ${{ matrix.runner }}
+          - clang: 14
+          - clang: 15
+          - clang: 16
+          - clang: 17
+          - clang: 18
+          - clang: 19
+    runs-on: ${{ matrix.runner || 'ubuntu-latest' }}
    steps:
      - name: Add archive repositories
        if: matrix.archive
        run: |
+          sudo gpg --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32
+          sudo gpg --export 3B4FE6ACC0B21F32 | sudo tee /etc/apt/trusted.gpg.d/ubuntu-keyring.gpg > /dev/null
          sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ ${{ matrix.archive }} main'
          sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ ${{ matrix.archive }} universe'
      - name: Install Clang ${{ matrix.clang }}
@@ -138,10 +134,9 @@ jobs:
          sudo apt-get update
          sudo apt-get install -y clang-${{ matrix.clang }}
      - name: Install libc++ ${{ matrix.clang }}
-        if: matrix.clang >= 11
        run: sudo apt-get install -y libc++-${{ matrix.clang }}-dev libc++abi-${{ matrix.clang }}-dev
      - name: Install libunwind ${{ matrix.clang }}
-        if: matrix.clang == 12  # dependency is missing in Ubuntu 22.04
+        if: matrix.clang == 12 # dependency is missing in Ubuntu 22.04
        run: sudo apt-get install -y libunwind-${{ matrix.clang }}-dev
      - name: Checkout
        uses: actions/checkout@v4
@@ -163,7 +158,7 @@ jobs:
  conf_test:
    name: Test configuration on Linux
    needs: [gcc, clang]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    steps:
      - name: Install
        run: |
@@ -184,19 +179,19 @@ jobs:

  conf_test_windows:
    name: Test configuration on Windows
-    runs-on: windows-2019
+    runs-on: windows-2022
    needs: [gcc, clang]
    steps:
      - name: Checkout
        uses: actions/checkout@v4
      - name: 32-bit
        run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
          cl /Isrc extras/conf_test/x86.cpp
        shell: cmd
      - name: 64-bit
        run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
          cl /Isrc extras/conf_test/x64.cpp
        shell: cmd

@@ -257,7 +252,7 @@ jobs:
            board: arduino:avr:uno
          - core: arduino:samd
            board: arduino:samd:mkr1000
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    steps:
      - name: Checkout
        uses: actions/checkout@v4
@@ -412,7 +407,7 @@ jobs:
  arm:
    name: GCC for ARM processor
    needs: gcc
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    steps:
      - name: Install
        run: |
@@ -431,7 +426,7 @@ jobs:
  coverage:
    needs: gcc
    name: Coverage
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    steps:
      - name: Install
        run: sudo apt-get install -y lcov ninja-build
@@ -463,7 +458,7 @@ jobs:
  valgrind:
    needs: gcc
    name: Valgrind
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    steps:
      - name: Install
        run: |
@@ -485,24 +480,24 @@ jobs:
  clang-tidy:
    needs: clang
    name: Clang-Tidy
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
    steps:
      - name: Install
-        run: sudo apt-get install -y clang-tidy cmake ninja-build
+        run: sudo apt-get install -y clang-tidy libc++-dev libc++abi-dev
      - name: Checkout
        uses: actions/checkout@v4
      - name: Configure
-        run: cmake -G Ninja -DCMAKE_CXX_CLANG_TIDY="clang-tidy-10;--warnings-as-errors=*" -DCMAKE_BUILD_TYPE=Debug .
+        run: cmake -G Ninja -DCMAKE_CXX_CLANG_TIDY="clang-tidy;--warnings-as-errors=*" -DCMAKE_BUILD_TYPE=Debug .
        env:
-          CC: clang-10
-          CXX: clang++-10
+          CC: clang
+          CXX: clang++
      - name: Check
        run: cmake --build . -- -k 0

  amalgamate:
    needs: gcc
    name: Amalgamate ArduinoJson.h
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    steps:
      - name: Checkout
        uses: actions/checkout@v4
@@ -578,7 +573,7 @@ jobs:

  codeql:
    name: CodeQL
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    needs: gcc

    permissions:
@@ -587,20 +582,20 @@ jobs:
      security-events: write

    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4

-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
-      with:
-        languages: cpp
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: cpp

-    - name: Build
-      run: |
-        cmake -DCMAKE_BUILD_TYPE=Debug .
-        cmake --build .
+      - name: Build
+        run: |
+          cmake -DCMAKE_BUILD_TYPE=Debug .
+          cmake --build .

-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
-      with:
-        category: "/language:cpp"
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
+        with:
+          category: "/language:cpp"
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,7 +8,7 @@ on:
 jobs:
  release:
    name: Create release
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    steps:
      - name: Set variables
        id: init
--- a/ArduinoJson.h
+++ b/ArduinoJson.h
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include "src/ArduinoJson.h"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,65 @@
 ArduinoJson: change log
 =======================

+HEAD
+----
+
+* Optimize storage of static strings
+
+> ### BREAKING CHANGES
+>
+> Static string cannot contain NUL characters anymore (they could since 7.3.0).
+> This is an extremely rare case, so you probably won't be affected.
+>
+> For example, the following code produces different output in 7.3 and 7.4:
+>
+> ```cpp
+> JsonDocument doc;
+> doc["a\0b"] = "c\0d";
+> serializeJson(doc, Serial);
+> // With Arduino 7.3 -> {"a\u0000b":"c\u0000d"}
+> // With Arduino 7.4 -> {"a":"c"}
+> ```
+>
+> `JsonString` contructor now only accepts two arguments, not three.
+> If your code uses `JsonString` to store a string as a pointer, you must remove the size argument.
+>
+> For example, if you have something like this:
+>
+> ```cpp
+> doc["key"] = JsonString(str.c_str(), str.size(), true);
+> ```
+>
+> You must replace with either:
+>
+> ```cpp
+> doc["key"] = JsonString(str.c_str(), true);  // store as pointer, cannot contain NUL characters
+> doc["key"] = JsonString(str.c_str(), str.size()); // store by copy, NUL characters allowed
+> doc["key"] = str; // same as previous line for supported string classes (`String`, `std::string`, etc.)
+> ```
+
+v7.4.2 (2025-06-20)
+------
+
+* Fix truncated strings on Arduino Due (issue #2181)
+
+v7.4.1 (2025-04-11)
+------
+
+* Fix crash with tiny Flash strings (issue #2170)
+
+v7.4.0 (2025-04-09)
+------
+
+* Optimize storage of tiny strings (up to 3 characters)
+* Fix support for `const char[]` (issue #2166)
+
+v7.3.1 (2025-02-27)
+------
+
+* Fix conversion from static string to number
+* Slightly reduce code size
+
 v7.3.0 (2024-12-29)
 ------

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2024, Benoit BLANCHON
+# Copyright © 2014-2025, Benoit BLANCHON
 # MIT License

 cmake_minimum_required(VERSION 3.15)
@@ -10,7 +10,7 @@ if(ESP_PLATFORM)
 	return()
 endif()

-project(ArduinoJson VERSION 7.3.0)
+project(ArduinoJson VERSION 7.4.2)

 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
 	include(CTest)
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,7 +1,7 @@
 The MIT License (MIT)
 ---------------------

-Copyright © 2014-2024, Benoit BLANCHON
+Copyright © 2014-2025, Benoit BLANCHON

 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

--- a/README.md
+++ b/README.md
@@ -80,7 +80,7 @@ ArduinoJson is a C++ JSON library for Arduino and IoT (Internet Of Things).
    * Continuously tested on
        * [Visual Studio 2017, 2019, 2022](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/7.x)
        * [GCC 4.8, 5, 6, 7, 8, 9, 10, 11, 12](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22)
-        * [Clang 3.9, 4.0, 5.0, 6.0, 7, 8, 9, 10, 11, 12, 13, 14, 15](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22)
+        * [Clang 7 to 19](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22)
    * [Continuously fuzzed with Google OSS Fuzz](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:arduinojson)
    * Passes all default checks of [clang-tidy](https://releases.llvm.org/10.0.0/tools/clang/tools/extra/docs/clang-tidy/)
 * Well documented
@@ -139,11 +139,6 @@ See the [tutorial on arduinojson.org](https://arduinojson.org/v7/doc/serializati

 ArduinoJson is thankful to its sponsors. Please give them a visit; they deserve it!

-<p>
-  <a href="https://www.programmingelectronics.com/" rel="sponsored">
-    <img src="https://arduinojson.org/images/2021/10/programmingeleactronicsacademy.png" alt="Programming Electronics Academy" width="200">
-  </a>
-</p>
 <p>
  <a href="https://github.com/1technophile" rel="sponsored">
    <img alt="1technophile" src="https://avatars.githubusercontent.com/u/12672732?s=40&v=4">
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 7.3.0.{build}
+version: 7.4.2.{build}
 environment:
  matrix:
    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
--- a/examples/JsonConfigFile/JsonConfigFile.ino
+++ b/examples/JsonConfigFile/JsonConfigFile.ino
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to store your project configuration in a file.
--- a/examples/JsonFilterExample/JsonFilterExample.ino
+++ b/examples/JsonFilterExample/JsonFilterExample.ino
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to use DeserializationOption::Filter
--- a/examples/JsonGeneratorExample/JsonGeneratorExample.ino
+++ b/examples/JsonGeneratorExample/JsonGeneratorExample.ino
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to generate a JSON document with ArduinoJson.
--- a/examples/JsonHttpClient/JsonHttpClient.ino
+++ b/examples/JsonHttpClient/JsonHttpClient.ino
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to parse a JSON document in an HTTP response.
--- a/examples/JsonParserExample/JsonParserExample.ino
+++ b/examples/JsonParserExample/JsonParserExample.ino
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to deserialize a JSON document with ArduinoJson.
--- a/examples/JsonServer/JsonServer.ino
+++ b/examples/JsonServer/JsonServer.ino
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to implement an HTTP server that sends a JSON document
--- a/examples/JsonUdpBeacon/JsonUdpBeacon.ino
+++ b/examples/JsonUdpBeacon/JsonUdpBeacon.ino
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to send a JSON document to a UDP socket.
--- a/examples/MsgPackParser/MsgPackParser.ino
+++ b/examples/MsgPackParser/MsgPackParser.ino
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to deserialize a MessagePack document with
--- a/examples/ProgmemExample/ProgmemExample.ino
+++ b/examples/ProgmemExample/ProgmemExample.ino
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License
 //
 // This example shows the different ways you can use Flash strings with
--- a/examples/StringExample/StringExample.ino
+++ b/examples/StringExample/StringExample.ino
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License
 //
 // This example shows the different ways you can use String with ArduinoJson.
--- a/extras/ci/espidf/CMakeLists.txt
+++ b/extras/ci/espidf/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2024, Benoit BLANCHON
+# Copyright © 2014-2025, Benoit BLANCHON
 # MIT License

 cmake_minimum_required(VERSION 3.5)
--- a/extras/ci/espidf/main/CMakeLists.txt
+++ b/extras/ci/espidf/main/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2024, Benoit BLANCHON
+# Copyright © 2014-2025, Benoit BLANCHON
 # MIT License

 idf_component_register(
--- a/extras/ci/espidf/main/main.cpp
+++ b/extras/ci/espidf/main/main.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/conf_test/avr.cpp
+++ b/extras/conf_test/avr.cpp
@@ -12,7 +12,7 @@ static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN");

 static_assert(ARDUINOJSON_USE_DOUBLE == 0, "ARDUINOJSON_USE_DOUBLE");

-static_assert(ArduinoJson::detail::ResourceManager::slotSize == 6, "slot size");
+static_assert(sizeof(ArduinoJson::detail::VariantData) == 6, "slot size");

 void setup() {}
 void loop() {}
--- a/extras/conf_test/esp8266.cpp
+++ b/extras/conf_test/esp8266.cpp
@@ -10,7 +10,7 @@ static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN");

 static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE");

-static_assert(ArduinoJson::detail::ResourceManager::slotSize == 8, "slot size");
+static_assert(sizeof(ArduinoJson::detail::VariantData) == 8, "slot size");

 void setup() {}
 void loop() {}
--- a/extras/conf_test/x64.cpp
+++ b/extras/conf_test/x64.cpp
@@ -10,7 +10,6 @@ static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN");

 static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE");

-static_assert(ArduinoJson::detail::ResourceManager::slotSize == 16,
-              "slot size");
+static_assert(sizeof(ArduinoJson::detail::VariantData) == 16, "slot size");

 int main() {}
--- a/extras/conf_test/x86.cpp
+++ b/extras/conf_test/x86.cpp
@@ -10,6 +10,6 @@ static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN");

 static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE");

-static_assert(ArduinoJson::detail::ResourceManager::slotSize == 8, "slot size");
+static_assert(sizeof(ArduinoJson::detail::VariantData) == 8, "slot size");

 int main() {}
--- a/extras/fuzzing/CMakeLists.txt
+++ b/extras/fuzzing/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2024, Benoit BLANCHON
+# Copyright © 2014-2025, Benoit BLANCHON
 # MIT License

 set(CMAKE_CXX_STANDARD 11)
--- a/extras/fuzzing/reproducer.cpp
+++ b/extras/fuzzing/reproducer.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 // This file is NOT use by Google's OSS fuzz
--- a/extras/scripts/wandbox/JsonGeneratorExample.cpp
+++ b/extras/scripts/wandbox/JsonGeneratorExample.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to generate a JSON document with ArduinoJson.
--- a/extras/scripts/wandbox/JsonParserExample.cpp
+++ b/extras/scripts/wandbox/JsonParserExample.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to deserialize a JSON document with ArduinoJson.
--- a/extras/scripts/wandbox/MsgPackParserExample.cpp
+++ b/extras/scripts/wandbox/MsgPackParserExample.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to generate a JSON document with ArduinoJson.
--- a/extras/tests/CMakeLists.txt
+++ b/extras/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2024, Benoit BLANCHON
+# Copyright © 2014-2025, Benoit BLANCHON
 # MIT License

 set(CMAKE_CXX_STANDARD 11)
--- a/extras/tests/Cpp17/CMakeLists.txt
+++ b/extras/tests/Cpp17/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2024, Benoit BLANCHON
+# Copyright © 2014-2025, Benoit BLANCHON
 # MIT License

 if(MSVC_VERSION LESS 1910)
--- a/extras/tests/Cpp17/string_view.cpp
+++ b/extras/tests/Cpp17/string_view.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 // we expect ArduinoJson.h to include <string_view>
--- a/extras/tests/Cpp20/CMakeLists.txt
+++ b/extras/tests/Cpp20/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2024, Benoit BLANCHON
+# Copyright © 2014-2025, Benoit BLANCHON
 # MIT License

 if(MSVC_VERSION LESS 1910)
--- a/extras/tests/Deprecated/BasicJsonDocument.cpp
+++ b/extras/tests/Deprecated/BasicJsonDocument.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
@@ -46,7 +46,7 @@ TEST_CASE("BasicJsonDocument") {
    deserializeJson(doc, "{\"hello\":\"world\"}");
    REQUIRE(doc.as<std::string>() == "{\"hello\":\"world\"}");
    doc.clear();
-    REQUIRE(allocatorLog == "ARAARDDD");
+    REQUIRE(allocatorLog == "AARARDDD");
  }

  SECTION("copy") {
@@ -54,7 +54,7 @@ TEST_CASE("BasicJsonDocument") {
    doc["hello"] = "world";
    auto copy = doc;
    REQUIRE(copy.as<std::string>() == "{\"hello\":\"world\"}");
-    REQUIRE(allocatorLog == "AA");
+    REQUIRE(allocatorLog == "AAAA");
  }

  SECTION("capacity") {
--- a/extras/tests/Deprecated/CMakeLists.txt
+++ b/extras/tests/Deprecated/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2024, Benoit BLANCHON
+# Copyright © 2014-2025, Benoit BLANCHON
 # MIT License

 if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
--- a/extras/tests/Deprecated/DynamicJsonDocument.cpp
+++ b/extras/tests/Deprecated/DynamicJsonDocument.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/Deprecated/StaticJsonDocument.cpp
+++ b/extras/tests/Deprecated/StaticJsonDocument.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/Deprecated/add.cpp
+++ b/extras/tests/Deprecated/add.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/Deprecated/containsKey.cpp
+++ b/extras/tests/Deprecated/containsKey.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/Deprecated/createNestedArray.cpp
+++ b/extras/tests/Deprecated/createNestedArray.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/Deprecated/createNestedObject.cpp
+++ b/extras/tests/Deprecated/createNestedObject.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/Deprecated/macros.cpp
+++ b/extras/tests/Deprecated/macros.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/Deprecated/memoryUsage.cpp
+++ b/extras/tests/Deprecated/memoryUsage.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/Deprecated/shallowCopy.cpp
+++ b/extras/tests/Deprecated/shallowCopy.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/FailingBuilds/CMakeLists.txt
+++ b/extras/tests/FailingBuilds/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2024, Benoit BLANCHON
+# Copyright © 2014-2025, Benoit BLANCHON
 # MIT License

 macro(add_failing_build source_file)
--- a/extras/tests/FailingBuilds/Issue978.cpp
+++ b/extras/tests/FailingBuilds/Issue978.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/FailingBuilds/assign_char.cpp
+++ b/extras/tests/FailingBuilds/assign_char.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/FailingBuilds/deserialize_object.cpp
+++ b/extras/tests/FailingBuilds/deserialize_object.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/FailingBuilds/read_long_long.cpp
+++ b/extras/tests/FailingBuilds/read_long_long.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #define ARDUINOJSON_USE_LONG_LONG 0
--- a/extras/tests/FailingBuilds/variant_as_char.cpp
+++ b/extras/tests/FailingBuilds/variant_as_char.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/FailingBuilds/write_long_long.cpp
+++ b/extras/tests/FailingBuilds/write_long_long.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #define ARDUINOJSON_USE_LONG_LONG 0
--- a/extras/tests/Helpers/Allocators.hpp
+++ b/extras/tests/Helpers/Allocators.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #pragma once
@@ -269,10 +269,16 @@ inline size_t sizeofPoolList(size_t n = ARDUINOJSON_INITIAL_POOL_COUNT) {
  return sizeof(MemoryPool<VariantData>) * n;
 }

+template <typename T = ArduinoJson::detail::VariantData>
 inline size_t sizeofPool(
    ArduinoJson::detail::SlotCount n = ARDUINOJSON_POOL_CAPACITY) {
+  return ArduinoJson::detail::MemoryPool<T>::slotsToBytes(n);
+}
+
+inline size_t sizeofStaticStringPool(
+    ArduinoJson::detail::SlotCount n = ARDUINOJSON_POOL_CAPACITY) {
  using namespace ArduinoJson::detail;
-  return MemoryPool<VariantData>::slotsToBytes(n);
+  return MemoryPool<const char*>::slotsToBytes(n);
 }

 inline size_t sizeofStringBuffer(size_t iteration = 1) {
--- a/extras/tests/Helpers/Arduino.h
+++ b/extras/tests/Helpers/Arduino.h
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #pragma once
--- a/extras/tests/Helpers/CustomReader.hpp
+++ b/extras/tests/Helpers/CustomReader.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #pragma once
--- a/extras/tests/Helpers/Literals.hpp
+++ b/extras/tests/Helpers/Literals.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #pragma once
--- a/extras/tests/Helpers/api/Print.h
+++ b/extras/tests/Helpers/api/Print.h
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #pragma once
@@ -13,21 +13,21 @@ class Print {
  virtual ~Print() {}

  virtual size_t write(uint8_t) = 0;
-  virtual size_t write(const uint8_t *buffer, size_t size) = 0;
+  virtual size_t write(const uint8_t* buffer, size_t size) = 0;

-  size_t write(const char *str) {
+  size_t write(const char* str) {
    if (!str)
      return 0;
-    return write(reinterpret_cast<const uint8_t *>(str), strlen(str));
+    return write(reinterpret_cast<const uint8_t*>(str), strlen(str));
  }

-  size_t write(const char *buffer, size_t size) {
-    return write(reinterpret_cast<const uint8_t *>(buffer), size);
+  size_t write(const char* buffer, size_t size) {
+    return write(reinterpret_cast<const uint8_t*>(buffer), size);
  }
 };

 class Printable {
 public:
  virtual ~Printable() {}
-  virtual size_t printTo(Print &p) const = 0;
+  virtual size_t printTo(Print& p) const = 0;
 };
--- a/extras/tests/Helpers/api/Stream.h
+++ b/extras/tests/Helpers/api/Stream.h
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #pragma once
@@ -10,5 +10,5 @@ class Stream  // : public Print
 public:
  virtual ~Stream() {}
  virtual int read() = 0;
-  virtual size_t readBytes(char *buffer, size_t length) = 0;
+  virtual size_t readBytes(char* buffer, size_t length) = 0;
 };
--- a/extras/tests/Helpers/api/String.h
+++ b/extras/tests/Helpers/api/String.h
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #pragma once
--- a/extras/tests/Helpers/avr/pgmspace.h
+++ b/extras/tests/Helpers/avr/pgmspace.h
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #pragma once
--- a/extras/tests/IntegrationTests/CMakeLists.txt
+++ b/extras/tests/IntegrationTests/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2024, Benoit BLANCHON
+# Copyright © 2014-2025, Benoit BLANCHON
 # MIT License

 add_executable(IntegrationTests
--- a/extras/tests/IntegrationTests/gbathree.cpp
+++ b/extras/tests/IntegrationTests/gbathree.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/IntegrationTests/issue772.cpp
+++ b/extras/tests/IntegrationTests/issue772.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/IntegrationTests/openweathermap.cpp
+++ b/extras/tests/IntegrationTests/openweathermap.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/IntegrationTests/round_trip.cpp
+++ b/extras/tests/IntegrationTests/round_trip.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonArray/CMakeLists.txt
+++ b/extras/tests/JsonArray/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2024, Benoit BLANCHON
+# Copyright © 2014-2025, Benoit BLANCHON
 # MIT License

 add_executable(JsonArrayTests
--- a/extras/tests/JsonArray/add.cpp
+++ b/extras/tests/JsonArray/add.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
@@ -8,7 +8,7 @@
 #include "Allocators.hpp"
 #include "Literals.hpp"

-using ArduinoJson::detail::sizeofArray;
+using namespace ArduinoJson::detail;

 TEST_CASE("JsonArray::add(T)") {
  SpyingAllocator spy;
@@ -33,7 +33,8 @@ TEST_CASE("JsonArray::add(T)") {
    REQUIRE(array[0].is<double>());
    REQUIRE_FALSE(array[0].is<bool>());
    REQUIRE(spy.log() == AllocatorLog{
-                             Allocate(sizeofPool()),
+                             Allocate(sizeofPool<VariantData>()),
+                             Allocate(sizeofPool<EightByteValue>()),
                         });
  }

@@ -56,6 +57,7 @@ TEST_CASE("JsonArray::add(T)") {
    REQUIRE(array[0].is<int>() == false);
    REQUIRE(spy.log() == AllocatorLog{
                             Allocate(sizeofPool()),
+                             Allocate(sizeofStaticStringPool()),
                         });
  }

--- a/extras/tests/JsonArray/clear.cpp
+++ b/extras/tests/JsonArray/clear.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonArray/compare.cpp
+++ b/extras/tests/JsonArray/compare.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonArray/copyArray.cpp
+++ b/extras/tests/JsonArray/copyArray.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonArray/equals.cpp
+++ b/extras/tests/JsonArray/equals.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonArray/isNull.cpp
+++ b/extras/tests/JsonArray/isNull.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonArray/iterator.cpp
+++ b/extras/tests/JsonArray/iterator.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonArray/nesting.cpp
+++ b/extras/tests/JsonArray/nesting.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonArray/remove.cpp
+++ b/extras/tests/JsonArray/remove.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonArray/size.cpp
+++ b/extras/tests/JsonArray/size.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonArray/subscript.cpp
+++ b/extras/tests/JsonArray/subscript.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonArray/unbound.cpp
+++ b/extras/tests/JsonArray/unbound.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonArrayConst/CMakeLists.txt
+++ b/extras/tests/JsonArrayConst/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2024, Benoit BLANCHON
+# Copyright © 2014-2025, Benoit BLANCHON
 # MIT License

 add_executable(JsonArrayConstTests
--- a/extras/tests/JsonArrayConst/equals.cpp
+++ b/extras/tests/JsonArrayConst/equals.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonArrayConst/isNull.cpp
+++ b/extras/tests/JsonArrayConst/isNull.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonArrayConst/iterator.cpp
+++ b/extras/tests/JsonArrayConst/iterator.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonArrayConst/nesting.cpp
+++ b/extras/tests/JsonArrayConst/nesting.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonArrayConst/size.cpp
+++ b/extras/tests/JsonArrayConst/size.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonArrayConst/subscript.cpp
+++ b/extras/tests/JsonArrayConst/subscript.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonDeserializer/CMakeLists.txt
+++ b/extras/tests/JsonDeserializer/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2024, Benoit BLANCHON
+# Copyright © 2014-2025, Benoit BLANCHON
 # MIT License

 add_executable(JsonDeserializerTests
--- a/extras/tests/JsonDeserializer/DeserializationError.cpp
+++ b/extras/tests/JsonDeserializer/DeserializationError.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonDeserializer/array.cpp
+++ b/extras/tests/JsonDeserializer/array.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
@@ -7,7 +7,7 @@

 #include "Allocators.hpp"

-using ArduinoJson::detail::sizeofArray;
+using namespace ArduinoJson::detail;

 TEST_CASE("deserialize JSON array") {
  SpyingAllocator spy;
@@ -92,8 +92,12 @@ TEST_CASE("deserialize JSON array") {
      REQUIRE(arr[0].as<double>() == Approx(4.2123456));
      REQUIRE(arr[1] == -7E89);
      REQUIRE(spy.log() == AllocatorLog{
-                               Allocate(sizeofPool()),
-                               Reallocate(sizeofPool(), sizeofPool(4)),
+                               Allocate(sizeofPool<VariantData>()),
+                               Allocate(sizeofPool<EightByteValue>()),
+                               Reallocate(sizeofPool<VariantData>(),
+                                          sizeofPool<VariantData>(2)),
+                               Reallocate(sizeofPool<EightByteValue>(),
+                                          sizeofPool<EightByteValue>(2)),
                           });
    }

--- a/extras/tests/JsonDeserializer/destination_types.cpp
+++ b/extras/tests/JsonDeserializer/destination_types.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
@@ -104,6 +104,8 @@ TEST_CASE("deserializeJson(MemberProxy)") {

    REQUIRE(err == DeserializationError::Ok);
    REQUIRE(doc.as<std::string>() == "{\"hello\":\"world\",\"value\":[42]}");
-    REQUIRE(spy.log() == AllocatorLog{});
+    REQUIRE(spy.log() == AllocatorLog{
+                             Allocate(sizeofStaticStringPool()),
+                         });
  }
 }
--- a/extras/tests/JsonDeserializer/errors.cpp
+++ b/extras/tests/JsonDeserializer/errors.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #define ARDUINOJSON_DECODE_UNICODE 1
@@ -121,7 +121,7 @@ TEST_CASE("deserializeJson() returns NoMemory if string length overflows") {
  }
 }

-TEST_CASE("deserializeJson() returns NoMemory if extension allocation fails") {
+TEST_CASE("deserializeJson() returns NoMemory if 8-bit slot allocation fails") {
  JsonDocument doc(FailingAllocator::instance());

  SECTION("uint32_t should pass") {
--- a/extras/tests/JsonDeserializer/filter.cpp
+++ b/extras/tests/JsonDeserializer/filter.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #define ARDUINOJSON_ENABLE_COMMENTS 1
@@ -825,7 +825,9 @@ TEST_CASE("shrink filter") {

  deserializeJson(doc, "{}", DeserializationOption::Filter(filter));

-  REQUIRE(spy.log() == AllocatorLog{
-                           Reallocate(sizeofPool(), sizeofObject(1)),
-                       });
+  REQUIRE(spy.log() ==
+          AllocatorLog{
+              Reallocate(sizeofPool(), sizeofObject(1)),
+              Reallocate(sizeofStaticStringPool(), sizeofStaticStringPool(1)),
+          });
 }
--- a/extras/tests/JsonDeserializer/input_types.cpp
+++ b/extras/tests/JsonDeserializer/input_types.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
@@ -26,8 +26,8 @@ TEST_CASE("deserializeJson(char*)") {
  REQUIRE(spy.log() ==
          AllocatorLog{
              Allocate(sizeofStringBuffer()),
-              Reallocate(sizeofStringBuffer(), sizeofString("hello")),
              Allocate(sizeofPool()),
+              Reallocate(sizeofStringBuffer(), sizeofString("hello")),
              Allocate(sizeofStringBuffer()),
              Reallocate(sizeofStringBuffer(), sizeofString("world")),
              Reallocate(sizeofPool(), sizeofObject(1)),
--- a/extras/tests/JsonDeserializer/misc.cpp
+++ b/extras/tests/JsonDeserializer/misc.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonDeserializer/nestingLimit.cpp
+++ b/extras/tests/JsonDeserializer/nestingLimit.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
--- a/extras/tests/JsonDeserializer/number.cpp
+++ b/extras/tests/JsonDeserializer/number.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #define ARDUINOJSON_USE_LONG_LONG 0
--- a/extras/tests/JsonDeserializer/object.cpp
+++ b/extras/tests/JsonDeserializer/object.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
@@ -292,22 +292,23 @@ TEST_CASE("deserialize JSON object") {
    }

    SECTION("Repeated key") {
-      DeserializationError err = deserializeJson(doc, "{a:{b:{c:1}},a:2}");
+      DeserializationError err =
+          deserializeJson(doc, "{alfa:{bravo:{charlie:1}},alfa:2}");

      REQUIRE(err == DeserializationError::Ok);
-      REQUIRE(doc.as<std::string>() == "{\"a\":2}");
+      REQUIRE(doc.as<std::string>() == "{\"alfa\":2}");
      REQUIRE(spy.log() ==
              AllocatorLog{
                  Allocate(sizeofStringBuffer()),
-                  Reallocate(sizeofStringBuffer(), sizeofString("a")),
                  Allocate(sizeofPool()),
+                  Reallocate(sizeofStringBuffer(), sizeofString("alfa")),
                  Allocate(sizeofStringBuffer()),
-                  Reallocate(sizeofStringBuffer(), sizeofString("b")),
+                  Reallocate(sizeofStringBuffer(), sizeofString("bravo")),
                  Allocate(sizeofStringBuffer()),
-                  Reallocate(sizeofStringBuffer(), sizeofString("c")),
+                  Reallocate(sizeofStringBuffer(), sizeofString("charlie")),
                  Allocate(sizeofStringBuffer()),
-                  Deallocate(sizeofString("b")),
-                  Deallocate(sizeofString("c")),
+                  Deallocate(sizeofString("bravo")),
+                  Deallocate(sizeofString("charlie")),
                  Deallocate(sizeofStringBuffer()),
                  Reallocate(sizeofPool(), sizeofObject(2) + sizeofObject(1)),
              });
@@ -378,7 +379,7 @@ TEST_CASE("deserialize JSON object under memory constraints") {
  }

  SECTION("pool allocation fails") {
-    timebomb.setCountdown(2);
+    timebomb.setCountdown(1);
    char input[] = "{\"a\":1}";

    DeserializationError err = deserializeJson(doc, input);
@@ -389,11 +390,11 @@ TEST_CASE("deserialize JSON object under memory constraints") {

  SECTION("string allocation fails") {
    timebomb.setCountdown(3);
-    char input[] = "{\"a\":\"b\"}";
+    char input[] = "{\"alfa\":\"bravo\"}";

    DeserializationError err = deserializeJson(doc, input);

    REQUIRE(err == DeserializationError::NoMemory);
-    REQUIRE(doc.as<std::string>() == "{\"a\":null}");
+    REQUIRE(doc.as<std::string>() == "{\"alfa\":null}");
  }
 }
--- a/extras/tests/JsonDeserializer/string.cpp
+++ b/extras/tests/JsonDeserializer/string.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #define ARDUINOJSON_DECODE_UNICODE 1
@@ -133,8 +133,8 @@ TEST_CASE("Allocation of the key fails") {
    REQUIRE(spy.log() ==
            AllocatorLog{
                Allocate(sizeofStringBuffer()),
-                Reallocate(sizeofStringBuffer(), sizeofString("hello")),
                Allocate(sizeofPool()),
+                Reallocate(sizeofStringBuffer(), sizeofString("hello")),
                AllocateFail(sizeofStringBuffer()),
                ReallocateFail(sizeofPool(), sizeofObject(1)),
            });
@@ -155,8 +155,8 @@ TEST_CASE("Allocation of the key fails") {
    REQUIRE(spy.log() ==
            AllocatorLog{
                Allocate(sizeofStringBuffer()),
-                Reallocate(sizeofStringBuffer(), sizeofString("hello")),
                Allocate(sizeofPool()),
+                Reallocate(sizeofStringBuffer(), sizeofString("hello")),
                AllocateFail(sizeofStringBuffer()),
                ReallocateFail(sizeofPool(), sizeofObject(1)),
            });
--- a/extras/tests/JsonDocument/CMakeLists.txt
+++ b/extras/tests/JsonDocument/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2024, Benoit BLANCHON
+# Copyright © 2014-2025, Benoit BLANCHON
 # MIT License

 add_executable(JsonDocumentTests
--- a/extras/tests/JsonDocument/ElementProxy.cpp
+++ b/extras/tests/JsonDocument/ElementProxy.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #include <ArduinoJson.h>
@@ -31,6 +31,7 @@ TEST_CASE("ElementProxy::add()") {
    REQUIRE(doc.as<std::string>() == "[[\"world\"]]");
    REQUIRE(spy.log() == AllocatorLog{
                             Allocate(sizeofPool()),
+                             Allocate(sizeofStaticStringPool()),
                         });
  }

--- a/extras/tests/JsonDocument/MemberProxy.cpp
+++ b/extras/tests/JsonDocument/MemberProxy.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2024, Benoit BLANCHON
+// Copyright © 2014-2025, Benoit BLANCHON
 // MIT License

 #define ARDUINOJSON_ENABLE_ARDUINO_STRING 1
@@ -25,6 +25,7 @@ TEST_CASE("MemberProxy::add()") {
    REQUIRE(doc.as<std::string>() == "{\"hello\":[42]}");
    REQUIRE(spy.log() == AllocatorLog{
                             Allocate(sizeofPool()),
+                             Allocate(sizeofStaticStringPool()),
                         });
  }

@@ -34,6 +35,7 @@ TEST_CASE("MemberProxy::add()") {
    REQUIRE(doc.as<std::string>() == "{\"hello\":[\"world\"]}");
    REQUIRE(spy.log() == AllocatorLog{
                             Allocate(sizeofPool()),
+                             Allocate(sizeofStaticStringPool()),
                         });
  }

@@ -44,6 +46,7 @@ TEST_CASE("MemberProxy::add()") {
    REQUIRE(doc.as<std::string>() == "{\"hello\":[\"world\"]}");
    REQUIRE(spy.log() == AllocatorLog{
                             Allocate(sizeofPool()),
+                             Allocate(sizeofStaticStringPool()),
                             Allocate(sizeofString("world")),
                         });
  }
@@ -55,8 +58,8 @@ TEST_CASE("MemberProxy::add()") {
    REQUIRE(doc.as<std::string>() == "{\"hello\":[\"world\"]}");
    REQUIRE(spy.log() == AllocatorLog{
                             Allocate(sizeofPool()),
+                             Allocate(sizeofStaticStringPool()),
                             Allocate(sizeofString("world")),
-
                         });
  }

@@ -71,6 +74,7 @@ TEST_CASE("MemberProxy::add()") {
    REQUIRE(doc.as<std::string>() == "{\"hello\":[\"world\"]}");
    REQUIRE(spy.log() == AllocatorLog{
                             Allocate(sizeofPool()),
+                             Allocate(sizeofStaticStringPool()),
                             Allocate(sizeofString("world")),
                         });
  }
@@ -399,7 +403,7 @@ TEST_CASE("MemberProxy under memory constraints") {
  }

  SECTION("value slot allocation fails") {
-    timebomb.setCountdown(1);
+    timebomb.setCountdown(2);

    // fill the pool entirely, but leave one slot for the key
    doc["foo"][ARDUINOJSON_POOL_CAPACITY - 4] = 1;
@@ -412,6 +416,7 @@ TEST_CASE("MemberProxy under memory constraints") {
    REQUIRE(doc.overflowed() == true);
    REQUIRE(spy.log() == AllocatorLog{
                             Allocate(sizeofPool()),
+                             Allocate(sizeofStaticStringPool()),
                             AllocateFail(sizeofPool()),
                         });
  }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Benoit Blanchon	589bbbfcca	VariantImpl: add `toArrayIfNull()` and `toObjectIfNull()`	2025-07-24 18:40:38 +02:00
Benoit Blanchon	03da4aad99	MsgPackSerializer: use iterators to serialize array and objects	2025-07-23 16:31:19 +02:00
Benoit Blanchon	60a767c706	JsonSerializer: use iterators to serialize array and objects	2025-07-23 16:14:03 +02:00
Benoit Blanchon	274fe06b33	VariantImpl: add copy functions	2025-07-20 18:23:03 +02:00
Benoit Blanchon	f680598a2f	VariantImpl: remove `addValue()` This removes the two-way dependency between `JsonVariant` and `VariantImpl`	2025-07-20 14:56:06 +02:00
Benoit Blanchon	e86c6acf2e	Return `bool` from all built-in `toJson` converters	2025-07-17 22:11:36 +02:00
Benoit Blanchon	0021ec81d1	StringPool: change `dereference` to take a `StringNode*`	2025-07-16 12:32:35 +02:00
Benoit Blanchon	372f2f2767	VariantImpl: extract `asOwnedString()`	2025-07-16 12:26:28 +02:00
Benoit Blanchon	fc8da90ba7	VariantImpl: extract `setOwnedString()`	2025-07-16 12:15:58 +02:00
Benoit Blanchon	38f61d322f	VariantImpl: change `setRawString()` to return `bool`	2025-07-16 12:11:58 +02:00
Benoit Blanchon	3793996d83	VariantImpl: change `setRawString()` to take an adapted string	2025-07-16 12:08:30 +02:00
Benoit Blanchon	43548db37d	ResourceManager: move out-of-class definitions back in the class	2025-07-15 18:32:38 +02:00
Benoit Blanchon	59573ac1f9	ResourceManager: decouple from `VariantImpl`	2025-07-14 19:51:25 +02:00
Benoit Blanchon	14a48978d9	CollectionIterator: rename `next()` to `move()`	2025-07-14 19:51:25 +02:00
Benoit Blanchon	2fa8b9664c	VariantImpl: move out-of-class definitions back in the class	2025-07-14 19:51:25 +02:00
Benoit Blanchon	2e20ce0795	CollectionIterator: remove friendship with `VariantImpl`	2025-07-11 18:36:51 +02:00
Benoit Blanchon	a5164f7fe3	CollectionIterator: remove `data()`	2025-07-11 18:34:17 +02:00
Benoit Blanchon	a9996d2293	VariantImpl: rename `getResourceManager()` to `resources()`	2025-07-11 18:31:38 +02:00
Benoit Blanchon	f9655a90ed	VariantImpl: rename `getData()` to `data()`	2025-07-11 18:30:10 +02:00
Benoit Blanchon	25942cce2d	CollectionIterator: replace `value()` with `operator*` and `operator->`	2025-07-11 18:24:51 +02:00
Benoit Blanchon	c6fa8c1c1f	Add `VariantImpl` in `CollectionIterator`	2025-07-11 18:19:35 +02:00
Benoit Blanchon	5589633697	Add `ResourceManager*` in `CollectionIterator` +80	2025-07-11 18:06:47 +02:00
Benoit Blanchon	7b7ee6cdeb	Add `VariantImpl::isUnbound()`	2025-07-11 14:32:30 +02:00
Benoit Blanchon	dca5ba481f	CollectionIterator: add `value()` member function	2025-07-10 19:30:51 +02:00
Benoit Blanchon	ec53525452	Rename `CollectionData.hpp` to `CollectionIterator.hpp`	2025-07-10 19:30:21 +02:00
Benoit Blanchon	0b9a8b6d2b	Replace `getData()/getResourceManager()` with `getImpl()`	2025-07-10 19:29:32 +02:00
Benoit Blanchon	f62d6f26e0	Merge `ArrayImpl`, `CollectionImpl`, and `ObjectImpl` into `VariantImpl`	2025-07-10 19:29:32 +02:00
Benoit Blanchon	1f1227d595	CollectionImpl: attach to `VariantData` instead of `CollectionData`	2025-07-10 19:29:32 +02:00
Benoit Blanchon	6f28ec0384	CollectionImpl: add `allocVariant()`, `getVariant()`, `freeVariant()`	2025-07-10 19:29:32 +02:00
Benoit Blanchon	6ba4507252	CollectionImpl: add helper `getCollectionData()`	2025-07-10 19:28:50 +02:00
Benoit Blanchon	a265ef4927	Move `CollectionData` definition	2025-07-10 19:28:50 +02:00
Benoit Blanchon	8790802ce3	Decouple `VariantImpl` from `ArrayImpl` and `ObjectImpl`	2025-07-10 19:28:50 +02:00
Benoit Blanchon	f1b06b588e	Move `VariantImpl` definition to `VariantImpl.hpp`	2025-07-10 19:28:50 +02:00
Benoit Blanchon	84fcd90658	Extract `VariantImpl`	2025-07-10 19:28:50 +02:00
Benoit Blanchon	bd551fa4ce	Extract `ArrayImpl`, `CollectionImpl`, and `ObjectImpl`	2025-07-10 19:27:44 +02:00
Benoit Blanchon	d9c6a70595	JsonObject: replace `ObjectData` member with `VariantData`	2025-07-10 19:17:13 +02:00
Benoit Blanchon	b44aa3a8b5	JsonArray: replace `ArrayData` member with `VariantData`	2025-07-10 19:17:13 +02:00
Benoit Blanchon	c2290a2386	JsonObjectConst: replace `ObjectData` member with `VariantData`	2025-07-10 19:17:13 +02:00
Benoit Blanchon	4457cb7cc5	JsonArrayConst: replace `ArrayData` member with `VariantData`	2025-07-10 19:17:13 +02:00
Benoit Blanchon	1e0bbd518c	Add a pool dedicated to 8-byte values (`double`/`int64_t`/`uint64_t`) This new pool replaced the "extension" slot where a secondary variant slot was used to store 8-byte values.	2025-07-10 19:17:13 +02:00
Benoit Blanchon	cc077c1b63	Store static strings in a dedicated pool Because a slot id is smaller than a pointer, this change will ultimately allow reducing the slot size.	2025-07-10 19:17:13 +02:00
Benoit Blanchon	509807d3c2	Remove `CollectionIterator::nextId_`	2025-07-10 19:16:47 +02:00
Benoit Blanchon	c07744dc0d	CI: upgrade Windows runner	2025-06-26 20:47:57 +02:00
Benoit Blanchon	733bc4ee82	Set version to 7.4.2	2025-06-20 09:37:14 +02:00
Benoit Blanchon	9aa77994b4	Remove sponsor Programming Electronics Academy	2025-06-20 08:43:48 +02:00
Benoit Blanchon	f051f8328d	Undef `true` and `false` macros Replacing `true` with `1` changes `JsonString("ABC", true)` into `JsonString("ABC", 1)`, so all static strings had a length of 1. This is a workaround for arduino/ArduinoCore-sam#50 Fixes #2181	2025-06-19 13:59:15 +02:00
Benoit Blanchon	411424b74e	CI: upgrade clang-tidy	2025-05-20 20:55:01 +02:00
Benoit Blanchon	5e5c287978	CI: upgrade Clang versions	2025-05-20 18:24:46 +02:00
Benoit Blanchon	377cf63075	CI: upgrade runner to `ubuntu-22.04`	2025-05-20 14:48:42 +02:00
Benoit Blanchon	3252013509	Set version to 7.4.1	2025-04-11 15:43:42 +02:00
Benoit Blanchon	deab127a2f	Fix crash with tiny Flash strings (issue #2170 )	2025-04-11 10:23:43 +02:00
Benoit Blanchon	96281de682	Set version to 7.4.0	2025-04-09 14:49:13 +02:00
Benoit Blanchon	f0e84e4933	Fix support for `const char[]` Fixes #2166	2025-04-09 08:55:09 +02:00
Benoit Blanchon	91397f9f06	Optimize storage of tiny strings (up to 3 characters)	2025-04-09 08:55:08 +02:00
Benoit Blanchon	7f75985e47	Change `StringBuffer::save()` to take a `VariantData*`	2025-02-28 10:05:50 +01:00
Benoit Blanchon	05b68fc7cc	Change `StringBuilder::save()` to take a `VariantData*`	2025-02-28 09:59:46 +01:00
Benoit Blanchon	b06cee8f4d	Remove the overload of `setString()` for `StringNode`	2025-02-28 09:23:56 +01:00
Benoit Blanchon	e03d8ae885	Set version to 7.3.1	2025-02-27 19:35:14 +01:00
Benoit Blanchon	cb1dcfa5e4	Reduce code size	2025-02-27 11:13:50 +01:00
Benoit Blanchon	67dd3120e6	Fix conversion from static string to number	2025-02-27 11:01:51 +01:00
Benoit Blanchon	9f3cf04415	Remove useless null check	2025-02-24 16:40:42 +01:00
Benoit Blanchon	01e49b33b7	Update copyright year	2025-02-24 15:18:26 +01:00