Merge 6f95045 into bdee512

.github/.wordlist.txt

@@ -154,6 +154,7 @@ blocklist
 blockquote
 bluetoothd
 bluez
+BOOL
 BooleanState
 bootable
 Bootloader

.gitmodules

@@ -308,3 +308,6 @@
 	url = https://github.com/google/perfetto.git
 	branch = master
 	platforms = linux,android
+[submodule "third_party/json/repo"]
+	path = third_party/json/repo
+	url = https://github.com/nlohmann/json.git

scripts/tools/check_includes_config.py

@@ -157,5 +157,10 @@
 
     # Library meant for non-embedded
     'src/tracing/json/json_tracing.cpp': {'string', 'sstream'},
-    'src/tracing/json/json_tracing.h': {'fstream'}
+    'src/tracing/json/json_tracing.h': {'fstream'},
+
+    # Not intended for embedded clients
+    'src/lib/support/jsontlv/JsonToTlv.cpp': {'sstream'},
+    'src/lib/support/jsontlv/JsonToTlv.h': {'string'},
+    'src/lib/support/jsontlv/TlvToJson.h': {'string'}
 }

src/lib/core/TLVReader.h

@@ -857,6 +857,11 @@ class DLL_EXPORT TLVReader
      */
     TLVBackingStore * GetBackingStore() { return mBackingStore; }
 
+    /**
+     * Returns true if the current TLV element type is a double.
+     */
+    bool IsElementDouble() { return ElementType() == TLVElementType::FloatingPointNumber64; }
+
     /**
      * Gets the point in the underlying input buffer that corresponds to the reader's current position.
      *

src/lib/support/jsontlv/BUILD.gn

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Project CHIP Authors
+# Copyright (c) 2020-2023 Project CHIP Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,12 +19,17 @@ config("jsontlv_config") {
 }
 
 static_library("jsontlv") {
-  sources = [ "TlvJson.cpp" ]
+  sources = [
+    "JsonToTlv.cpp",
+    "TlvJson.cpp",
+    "TlvToJson.cpp",
+  ]
 
   public_configs = [ ":jsontlv_config" ]
 
   public_deps = [
     "${chip_root}/src/lib/core",
+    "${chip_root}/third_party/json",
     jsoncpp_root,
   ]
 

src/lib/support/jsontlv/ElementTypes.h

@@ -0,0 +1,32 @@
+/*
+ *
+ *    Copyright (c) 2023 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+namespace {
+
+extern const char kElementTypeInt[]    = "INT";
+extern const char kElementTypeUInt[]   = "UINT";
+extern const char kElementTypeBool[]   = "BOOL";
+extern const char kElementTypeFloat[]  = "FLOAT";
+extern const char kElementTypeDouble[] = "DOUBLE";
+extern const char kElementTypeBytes[]  = "BYTES";
+extern const char kElementTypeString[] = "STRING";
+extern const char kElementTypeNull[]   = "NULL";
+extern const char kElementTypeStruct[] = "STRUCT";
+extern const char kElementTypeArray[]  = "ARRAY";
+extern const char kElementTypeEmpty[]  = "?";
+
+} // namespace