react-native-windows 0.68.0-preview.6 → 0.68.0-preview.7

package/.flowconfig

@@ -59,6 +59,8 @@
 ; Ignore the src folder - flow files are combined with ones from react-native into the root Libraries folder
 .*/vnext/src/.*
 
+.*/node_modules/resolve/test/resolver/malformed_package_json/package\.json$
+
 [untyped]
 .*/node_modules/@react-native-community/cli/.*/.*
 

package/Libraries/Core/ReactNativeVersion.js

@@ -13,5 +13,5 @@ exports.version = {
   major: 0,
   minor: 68,
   patch: 0,
-  prerelease: 'rc.1',
+  prerelease: 'rc.2',
 };

package/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj

@@ -24,7 +24,6 @@
   <Import Project="$(ReactNativeWindowsDir)PropertySheets\React.Cpp.props" />
   <Import Project="$(ReactNativeWindowsDir)PropertySheets\Generated\PackageVersion.g.props" />
   <Import Project="$(ReactNativeWindowsDir)PropertySheets\PackageVersionDefinitions.props" />
-  <Import Project="$(SolutionDir)packages\Microsoft.Web.WebView2.$(WebView2Version)\build\native\Microsoft.Web.WebView2.props" Condition="'$(WebView2Version)'!='' And Exists('$(SolutionDir)packages\Microsoft.Web.WebView2.$(WebView2Version)\build\native\Microsoft.Web.WebView2.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
@@ -138,7 +137,14 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>winsqlite3.lib;ChakraRT.lib;dxguid.lib;dloadhelper.lib;OneCoreUap_apiset.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <DelayLoadDLLs>chakra.dll;winsqlite3.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <DelayLoadDLLs>
+        api-ms-win-core-file-l1-2-0.dll;
+        api-ms-win-core-windowserrorreporting-l1-1-0.dll;
+        ext-ms-win-uiacore-l1-1-1.dll;
+        chakra.dll;
+        winsqlite3.dll;
+        %(DelayLoadDLLs)
+      </DelayLoadDLLs>
       <SubSystem>Console</SubSystem>
       <GenerateWindowsMetadata>true</GenerateWindowsMetadata>
       <ModuleDefinitionFile>Microsoft.ReactNative.def</ModuleDefinitionFile>
@@ -832,13 +838,6 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Choose>
-    <When Condition="'$(WebView2Version)'!=''">
-      <ItemGroup>
-        <PackageReference Include="Microsoft.Web.WebView2" Version="$(WebView2Version)" />
-      </ItemGroup>
-    </When>
-  </Choose>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Import Project="$(ReactNativeWindowsDir)PropertySheets\FastBuild.targets" />
   <Import Project="$(ReactNativeWindowsDir)PropertySheets\FixupRoslynCscWarnings.targets" />

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,7 +10,7 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.68.0-preview.6</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.68.0-preview.7</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>68</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.68.0-preview.6",
+  "version": "0.68.0-preview.7",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -23,11 +23,11 @@
   "dependencies": {
     "@babel/runtime": "^7.0.0",
     "@jest/create-cache-key-function": "^27.0.1",
-    "@react-native-community/cli": "^7.0.1",
+    "@react-native-community/cli": "^7.0.3",
     "@react-native-community/cli-platform-android": "^7.0.1",
     "@react-native-community/cli-platform-ios": "^7.0.1",
     "@react-native-windows/cli": "0.68.0-preview.6",
-    "@react-native-windows/virtualized-list": "0.68.0-preview.2",
+    "@react-native-windows/virtualized-list": "0.68.0-preview.3",
     "@react-native/assets": "1.0.0",
     "@react-native/normalize-color": "2.0.0",
     "@react-native/polyfills": "2.0.0",
@@ -47,6 +47,7 @@
     "promise": "^8.0.3",
     "react-devtools-core": "^4.23.0",
     "react-native-codegen": "^0.0.13",
+    "react-native-gradle-plugin": "^0.0.5",
     "react-refresh": "^0.4.0",
     "react-shallow-renderer": "16.14.1",
     "regenerator-runtime": "^0.13.2",
@@ -73,7 +74,7 @@
     "metro-config": "^0.67.0",
     "prettier": "^2.4.1",
     "react": "17.0.2",
-    "react-native": "0.68.0-rc.1",
+    "react-native": "0.68.0-rc.2",
     "react-native-platform-override": "^1.6.4",
     "react-refresh": "^0.4.0",
     "react-shallow-renderer": "16.14.1",
@@ -81,7 +82,7 @@
   },
   "peerDependencies": {
     "react": "17.0.2",
-    "react-native": "0.68.0-rc.1"
+    "react-native": "0.68.0-rc.2"
   },
   "beachball": {
     "defaultNpmTag": "preview",

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/mapbuffer/MapBuffer.cpp

@@ -1,128 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "MapBuffer.h"
-
-using namespace facebook::react;
-
-namespace facebook {
-namespace react {
-
-static inline int32_t bucketOffset(int32_t index) {
-  return sizeof(MapBuffer::Header) + sizeof(MapBuffer::Bucket) * index;
-}
-
-static inline int32_t valueOffset(int32_t bucketIndex) {
-  return bucketOffset(bucketIndex) + offsetof(MapBuffer::Bucket, data);
-}
-
-// TODO T83483191: Extend MapBuffer C++ implementation to support basic random
-// access
-MapBuffer::MapBuffer(std::vector<uint8_t> data) : bytes_(std::move(data)) {
-  auto header = reinterpret_cast<Header const *>(bytes_.data());
-  count_ = header->count;
-
-  if (header->bufferSize != bytes_.size()) {
-    LOG(ERROR) << "Error: Data size does not match, expected "
-               << header->bufferSize << " found: " << bytes_.size();
-    abort();
-  }
-}
-
-int32_t MapBuffer::getKeyBucket(Key key) const {
-  int32_t lo = 0;
-  int32_t hi = count_ - 1;
-  while (lo <= hi) {
-    int32_t mid = (lo + hi) >> 1;
-
-    Key midVal =
-        *reinterpret_cast<Key const *>(bytes_.data() + bucketOffset(mid));
-
-    if (midVal < key) {
-      lo = mid + 1;
-    } else if (midVal > key) {
-      hi = mid - 1;
-    } else {
-      return mid;
-    }
-  }
-
-  return -1;
-}
-
-int32_t MapBuffer::getInt(Key key) const {
-  auto bucketIndex = getKeyBucket(key);
-  react_native_assert(bucketIndex != -1 && "Key not found in MapBuffer");
-
-  return *reinterpret_cast<int32_t const *>(
-      bytes_.data() + valueOffset(bucketIndex));
-}
-
-bool MapBuffer::getBool(Key key) const {
-  return getInt(key) != 0;
-}
-
-double MapBuffer::getDouble(Key key) const {
-  auto bucketIndex = getKeyBucket(key);
-  react_native_assert(bucketIndex != -1 && "Key not found in MapBuffer");
-
-  return *reinterpret_cast<double const *>(
-      bytes_.data() + valueOffset(bucketIndex));
-}
-
-int32_t MapBuffer::getDynamicDataOffset() const {
-  // The start of dynamic data can be calculated as the offset of the next
-  // key in the map
-  return bucketOffset(count_);
-}
-
-std::string MapBuffer::getString(Key key) const {
-  // TODO T83483191:Add checks to verify that offsets are under the boundaries
-  // of the map buffer
-  int32_t dynamicDataOffset = getDynamicDataOffset();
-  int32_t offset = getInt(key);
-  int32_t stringLength = *reinterpret_cast<int32_t const *>(
-      bytes_.data() + dynamicDataOffset + offset);
-  uint8_t const *stringPtr =
-      bytes_.data() + dynamicDataOffset + offset + sizeof(int);
-
-  return std::string(stringPtr, stringPtr + stringLength);
-}
-
-MapBuffer MapBuffer::getMapBuffer(Key key) const {
-  // TODO T83483191: Add checks to verify that offsets are under the boundaries
-  // of the map buffer
-  int32_t dynamicDataOffset = getDynamicDataOffset();
-
-  int32_t offset = getInt(key);
-  int32_t mapBufferLength = *reinterpret_cast<int32_t const *>(
-      bytes_.data() + dynamicDataOffset + offset);
-
-  std::vector<uint8_t> value(mapBufferLength);
-
-  memcpy(
-      value.data(),
-      bytes_.data() + dynamicDataOffset + offset + sizeof(int32_t),
-      mapBufferLength);
-
-  return MapBuffer(std::move(value));
-}
-
-size_t MapBuffer::size() const {
-  return bytes_.size();
-}
-
-uint8_t const *MapBuffer::data() const {
-  return bytes_.data();
-}
-
-uint16_t MapBuffer::count() const {
-  return count_;
-}
-
-} // namespace react
-} // namespace facebook

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/mapbuffer/MapBuffer.h

@@ -1,150 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#pragma once
-
-#include <react/debug/react_native_assert.h>
-
-#include <glog/logging.h>
-
-#include <cstdint>
-#include <cstdlib>
-#include <limits>
-#include <string>
-#include <vector>
-
-namespace facebook {
-namespace react {
-
-class ReadableMapBuffer;
-
-// clang-format off
-
-/**
- * MapBuffer is an optimized sparse array format for transferring props-like
- * between C++ and other VMs. The implementation of this map is optimized to:
- * - be compact to optimize space when sparse (sparse is the common case).
- * - be accessible through JNI with zero/minimal copying via ByteBuffer.
- * - Have excellent C++ single-write and many-read performance by maximizing
- *   CPU cache performance through compactness, data locality, and fixed offsets
- *   where possible.
- * - be optimized for iteration and intersection against other maps, but with
- *   reasonably good random access as well.
- * - Work recursively for nested maps/arrays.
- * - Supports dynamic types that map to JSON.
- * - Don't require mutability - single-write on creation.
- * - have minimal APK size and build time impact.
- *
- * MapBuffer data is stored in a continuous chunk of memory (bytes_ field below) with the following layout:
- *
- * ┌─────────────────────Header──────────────────────┐
- * │                    10 bytes                     │
- * ├─Alignment─┬─Item count─┬──────Buffer size───────┤
- * │  2 bytes  │  2 bytes   │        4 bytes         │
- * └───────────┴────────────┴────────────────────────┘
- * ┌────────────────────────────────────────────────────────────────────────────────────────┐
- * │                           Buckets (one per item in the map)                            │
- * │                                                                                        │
- * ├───────────────────────────Bucket───────────────────────────┬───Bucket────┬─────────────┤
- * │                          12 bytes                          │  12 bytes   │             │
- * ├───Key───┬──Type───┬──────Value (primitive or offset)───────┤     ...     │     ...     │
- * │ 2 bytes │ 2 bytes │                8 bytes                 │             │             │
- * └─────────┴─────────┴────────────────────────────────────────┴─────────────┴─────────────┘
- * ┌────────────────────────────────────────────────────────────────────────────────────────┐
- * │  Dynamic data                                                                          │
- * │                                                                                        │
- * │  Free-form data for complex objects (e.g. strings or nested MapBuffers).               │
- * │  When dynamic data is serialized with some object, bucket value contains an offset of  │
- * │  associated byte in the array. The format of the data is not restricted, but common    │
- * │  practice is to use [length | bytes].                                                  │
- * └────────────────────────────────────────────────────────────────────────────────────────┘
- */
-
-// clang-format on
-
-class MapBuffer {
- public:
-  using Key = uint16_t;
-
-  // The first value in the buffer, used to check correct encoding/endianness on
-  // JVM side.
-  constexpr static uint16_t HEADER_ALIGNMENT = 0xFE;
-
-  struct Header {
-    uint16_t alignment = HEADER_ALIGNMENT; // alignment of serialization
-    uint16_t count; // amount of items in the map
-    uint32_t bufferSize; // Amount of bytes used to store the map in memory
-  };
-
-  #pragma pack(1)
-  struct Bucket {
-    Key key;
-    uint16_t type;
-    uint64_t data;
-
-    Bucket(Key key, uint16_t type, uint64_t data)
-        : key(key), type(type), data(data) {}
-  };
-
-  static_assert(sizeof(Header) == 8, "MapBuffer header size is incorrect.");
-  static_assert(sizeof(Bucket) == 12, "MapBuffer bucket size is incorrect");
-
-  /**
-   * Data types available for serialization in MapBuffer
-   * Keep in sync with `DataType` enum in `ReadableMapBuffer.java`, which
-   * expects the same values after reading them through JNI.
-   */
-  enum DataType : uint16_t {
-    Boolean = 0,
-    Int = 1,
-    Double = 2,
-    String = 3,
-    Map = 4,
-  };
-
-  explicit MapBuffer(std::vector<uint8_t> data);
-
-  MapBuffer(MapBuffer const &buffer) = delete;
-
-  MapBuffer &operator=(MapBuffer other) = delete;
-
-  MapBuffer(MapBuffer &&buffer) = default;
-
-  int32_t getInt(MapBuffer::Key key) const;
-
-  bool getBool(MapBuffer::Key key) const;
-
-  double getDouble(MapBuffer::Key key) const;
-
-  std::string getString(MapBuffer::Key key) const;
-
-  // TODO T83483191: review this declaration
-  MapBuffer getMapBuffer(MapBuffer::Key key) const;
-
-  size_t size() const;
-
-  uint8_t const *data() const;
-
-  uint16_t count() const;
-
- private:
-  // Buffer and its size
-  std::vector<uint8_t> const bytes_;
-
-  // amount of items in the MapBuffer
-  uint16_t count_ = 0;
-
-  // returns the relative offset of the first byte of dynamic data
-  int32_t getDynamicDataOffset() const;
-
-  int32_t getKeyBucket(MapBuffer::Key key) const;
-
-  friend ReadableMapBuffer;
-};
-
-} // namespace react
-} // namespace facebook

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/mapbuffer/MapBufferBuilder.cpp

@@ -1,149 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "MapBufferBuilder.h"
-#include <algorithm>
-
-using namespace facebook::react;
-
-namespace facebook {
-namespace react {
-
-constexpr uint32_t INT_SIZE = sizeof(uint32_t);
-constexpr double DOUBLE_SIZE = sizeof(double);
-constexpr uint32_t MAX_BUCKET_VALUE_SIZE = sizeof(uint64_t);
-
-MapBuffer MapBufferBuilder::EMPTY() {
-  return MapBufferBuilder(0).build();
-}
-
-MapBufferBuilder::MapBufferBuilder(uint32_t initialSize) {
-  buckets_.reserve(initialSize);
-  header_.count = 0;
-  header_.bufferSize = 0;
-}
-
-void MapBufferBuilder::storeKeyValue(
-    MapBuffer::Key key,
-    MapBuffer::DataType type,
-    uint8_t const *value,
-    uint32_t valueSize) {
-  if (valueSize > MAX_BUCKET_VALUE_SIZE) {
-    LOG(ERROR) << "Error: size of value must be <= MAX_VALUE_SIZE. ValueSize: "
-               << valueSize;
-    abort();
-  }
-
-  uint64_t data = 0;
-  auto *dataPtr = reinterpret_cast<uint8_t *>(&data);
-  memcpy(dataPtr, value, valueSize);
-  
-  buckets_.emplace_back(key, static_cast<uint16_t>(type), data);
-
-  header_.count++;
-
-  if (lastKey_ > key) {
-    needsSort_ = true;
-  }
-  lastKey_ = key;
-}
-
-void MapBufferBuilder::putBool(MapBuffer::Key key, bool value) {
-  int intValue = (int)value;
-  storeKeyValue(
-      key,
-      MapBuffer::DataType::Boolean,
-      reinterpret_cast<uint8_t const *>(&intValue),
-      INT_SIZE);
-}
-
-void MapBufferBuilder::putDouble(MapBuffer::Key key, double value) {
-  storeKeyValue(
-      key,
-      MapBuffer::DataType::Double,
-      reinterpret_cast<uint8_t const *>(&value),
-      static_cast<uint32_t>(DOUBLE_SIZE));
-}
-
-void MapBufferBuilder::putInt(MapBuffer::Key key, int32_t value) {
-  storeKeyValue(
-      key,
-      MapBuffer::DataType::Int,
-      reinterpret_cast<uint8_t const *>(&value),
-      INT_SIZE);
-}
-
-void MapBufferBuilder::putString(MapBuffer::Key key, std::string const &value) {
-  auto strSize = value.size();
-  const char *strData = value.data();
-
-  // format [length of string (int)] + [Array of Characters in the string]
-  auto offset = dynamicData_.size();
-  dynamicData_.resize(offset + INT_SIZE + strSize, 0);
-  memcpy(dynamicData_.data() + offset, &strSize, INT_SIZE);
-  memcpy(dynamicData_.data() + offset + INT_SIZE, strData, strSize);
-
-  // Store Key and pointer to the string
-  storeKeyValue(
-      key,
-      MapBuffer::DataType::String,
-      reinterpret_cast<uint8_t const *>(&offset),
-      INT_SIZE);
-}
-
-void MapBufferBuilder::putMapBuffer(MapBuffer::Key key, MapBuffer const &map) {
-  auto mapBufferSize = map.size();
-
-  auto offset = dynamicData_.size();
-
-  // format [length of buffer (int)] + [bytes of MapBuffer]
-  dynamicData_.resize(offset + INT_SIZE + mapBufferSize, 0);
-  memcpy(dynamicData_.data() + offset, &mapBufferSize, INT_SIZE);
-  // Copy the content of the map into dynamicData_
-  memcpy(dynamicData_.data() + offset + INT_SIZE, map.data(), mapBufferSize);
-
-  // Store Key and pointer to the string
-  storeKeyValue(
-      key,
-      MapBuffer::DataType::Map,
-      reinterpret_cast<uint8_t const *>(&offset),
-      INT_SIZE);
-}
-
-static inline bool compareBuckets(
-    MapBuffer::Bucket const &a,
-    MapBuffer::Bucket const &b) {
-  return a.key < b.key;
-}
-
-MapBuffer MapBufferBuilder::build() {
-  // Create buffer: [header] + [key, values] + [dynamic data]
-  auto bucketSize = buckets_.size() * sizeof(MapBuffer::Bucket);
-  auto headerSize = sizeof(MapBuffer::Header);
-  auto bufferSize = headerSize + bucketSize + dynamicData_.size();
-
-  header_.bufferSize = static_cast<uint32_t>(bufferSize);
-
-  if (needsSort_) {
-    std::sort(buckets_.begin(), buckets_.end(), compareBuckets);
-  }
-
-  // TODO(T83483191): add pass to check for duplicates
-
-  std::vector<uint8_t> buffer(bufferSize);
-  memcpy(buffer.data(), &header_, headerSize);
-  memcpy(buffer.data() + headerSize, buckets_.data(), bucketSize);
-  memcpy(
-      buffer.data() + headerSize + bucketSize,
-      dynamicData_.data(),
-      dynamicData_.size());
-
-  return MapBuffer(std::move(buffer));
-}
-
-} // namespace react
-} // namespace facebook

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/mapbuffer/MapBufferBuilder.h

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#pragma once
-
-#include <react/debug/react_native_assert.h>
-#include <react/renderer/mapbuffer/MapBuffer.h>
-
-namespace facebook {
-namespace react {
-
-// Default reserved size for buckets_ vector
-constexpr uint32_t INITIAL_BUCKETS_SIZE = 10;
-
-/**
- * MapBufferBuilder is a builder class for MapBuffer
- */
-class MapBufferBuilder {
- public:
-  MapBufferBuilder(uint32_t initialSize = INITIAL_BUCKETS_SIZE);
-
-  static MapBuffer EMPTY();
-
-  void putInt(MapBuffer::Key key, int32_t value);
-
-  void putBool(MapBuffer::Key key, bool value);
-
-  void putDouble(MapBuffer::Key key, double value);
-
-  void putString(MapBuffer::Key key, std::string const &value);
-
-  void putMapBuffer(MapBuffer::Key key, MapBuffer const &map);
-
-  MapBuffer build();
-
- private:
-  MapBuffer::Header header_;
-
-  std::vector<MapBuffer::Bucket> buckets_{};
-
-  std::vector<uint8_t> dynamicData_{};
-
-  uint16_t lastKey_{0};
-
-  bool needsSort_{false};
-
-  void storeKeyValue(
-      MapBuffer::Key key,
-      MapBuffer::DataType type,
-      uint8_t const *value,
-      uint32_t valueSize);
-};
-
-} // namespace react
-} // namespace facebook

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/mapbuffer/tests/MapBufferTest.cpp

@@ -1,167 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include <memory>
-
-#include <gtest/gtest.h>
-#pragma pack(pop, 1)
-#include <react/renderer/mapbuffer/MapBuffer.h>
-#include <react/renderer/mapbuffer/MapBufferBuilder.h>
-
-using namespace facebook::react;
-
-TEST(MapBufferTest, testSimpleIntMap) {
-  auto builder = MapBufferBuilder();
-
-  builder.putInt(0, 1234);
-  builder.putInt(1, 4321);
-
-  auto map = builder.build();
-
-  EXPECT_EQ(map.count(), 2);
-  EXPECT_EQ(map.getInt(0), 1234);
-  EXPECT_EQ(map.getInt(1), 4321);
-}
-
-TEST(MapBufferTest, testMapBufferExtension) {
-  // 26 = 2 buckets: 2*10 + 6 sizeof(header)
-  int initialSize = 26;
-  auto buffer = MapBufferBuilder(initialSize);
-
-  buffer.putInt(0, 1234);
-  buffer.putInt(1, 4321);
-  buffer.putInt(2, 2121);
-  buffer.putInt(3, 1212);
-
-  auto map = buffer.build();
-
-  EXPECT_EQ(map.count(), 4);
-
-  EXPECT_EQ(map.getInt(0), 1234);
-  EXPECT_EQ(map.getInt(1), 4321);
-  EXPECT_EQ(map.getInt(2), 2121);
-  EXPECT_EQ(map.getInt(3), 1212);
-}
-
-TEST(MapBufferTest, testBoolEntries) {
-  auto buffer = MapBufferBuilder();
-
-  buffer.putBool(0, true);
-  buffer.putBool(1, false);
-
-  auto map = buffer.build();
-
-  EXPECT_EQ(map.count(), 2);
-  EXPECT_EQ(map.getBool(0), true);
-  EXPECT_EQ(map.getBool(1), false);
-}
-
-TEST(MapBufferTest, testDoubleEntries) {
-  auto buffer = MapBufferBuilder();
-
-  buffer.putDouble(0, 123.4);
-  buffer.putDouble(1, 432.1);
-
-  auto map = buffer.build();
-
-  EXPECT_EQ(map.count(), 2);
-
-  EXPECT_EQ(map.getDouble(0), 123.4);
-  EXPECT_EQ(map.getDouble(1), 432.1);
-}
-
-TEST(MapBufferTest, testStringEntries) {
-  auto builder = MapBufferBuilder();
-
-  builder.putString(0, "This is a test");
-  auto map = builder.build();
-
-  EXPECT_EQ(map.getString(0), "This is a test");
-}
-
-TEST(MapBufferTest, testUTFStringEntry) {
-  auto builder = MapBufferBuilder();
-
-  builder.putString(0, "Let's count: 的, 一, 是");
-  auto map = builder.build();
-
-  EXPECT_EQ(map.getString(0), "Let's count: 的, 一, 是");
-}
-
-TEST(MapBufferTest, testEmojiStringEntry) {
-  auto builder = MapBufferBuilder();
-
-  builder.putString(
-      0, "Let's count: 1️⃣, 2️⃣, 3️⃣, 🤦🏿‍♀️");
-  auto map = builder.build();
-
-  EXPECT_EQ(
-      map.getString(0),
-      "Let's count: 1️⃣, 2️⃣, 3️⃣, 🤦🏿‍♀️");
-}
-
-TEST(MapBufferTest, testUTFStringEntries) {
-  auto builder = MapBufferBuilder();
-
-  builder.putString(0, "Let's count: 的, 一, 是");
-  builder.putString(1, "This is a test");
-  auto map = builder.build();
-
-  EXPECT_EQ(map.getString(0), "Let's count: 的, 一, 是");
-  EXPECT_EQ(map.getString(1), "This is a test");
-}
-
-TEST(MapBufferTest, testEmptyMap) {
-  auto builder = MapBufferBuilder();
-  auto map = builder.build();
-  EXPECT_EQ(map.count(), 0);
-}
-
-TEST(MapBufferTest, testEmptyMapConstant) {
-  auto map = MapBufferBuilder::EMPTY();
-  EXPECT_EQ(map.count(), 0);
-}
-
-TEST(MapBufferTest, testMapEntries) {
-  auto builder = MapBufferBuilder();
-  builder.putString(0, "This is a test");
-  builder.putInt(1, 1234);
-  auto map = builder.build();
-
-  EXPECT_EQ(map.count(), 2);
-  EXPECT_EQ(map.getString(0), "This is a test");
-  EXPECT_EQ(map.getInt(1), 1234);
-
-  auto builder2 = MapBufferBuilder();
-  builder2.putInt(0, 4321);
-  builder2.putMapBuffer(1, map);
-  auto map2 = builder2.build();
-
-  EXPECT_EQ(map2.count(), 2);
-  EXPECT_EQ(map2.getInt(0), 4321);
-
-  MapBuffer readMap2 = map2.getMapBuffer(1);
-
-  EXPECT_EQ(readMap2.count(), 2);
-  EXPECT_EQ(readMap2.getString(0), "This is a test");
-  EXPECT_EQ(readMap2.getInt(1), 1234);
-}
-
-TEST(MapBufferTest, testMapRandomAccess) {
-  auto builder = MapBufferBuilder();
-  builder.putInt(1234, 4321);
-  builder.putString(0, "This is a test");
-  builder.putDouble(8, 908.1);
-  builder.putString(65535, "Let's count: 的, 一, 是");
-  auto map = builder.build();
-
-  EXPECT_EQ(map.count(), 4);
-  EXPECT_EQ(map.getString(0), "This is a test");
-  EXPECT_EQ(map.getDouble(8), 908.1);
-  EXPECT_EQ(map.getInt(1234), 4321);
-  EXPECT_EQ(map.getString(65535), "Let's count: 的, 一, 是");
-}