Merge baa5973128 into add5f40d31

.bazelrc

@@ -1,7 +0,0 @@
-build --features=layering_check
-build --enable_bzlmod
-
-build --enable_platform_specific_config
-build:linux --cxxopt=-std=c++20
-build:macos --cxxopt=-std=c++20
-build:windows --cxxopt=-std:c++20

.bcr/presubmit.yml

@@ -1,36 +1,21 @@
 matrix:
-  bazel:
+  platform:
-    - 7.x
+  - centos7
-    - 8.x
+  - debian10
-    - rolling
+  - ubuntu2004
-  unix_platform:
+  - macos
-    - debian11
+  - windows
-    - ubuntu2204
+  bazel: [6.x, 7.x, 8.x]
-    - macos
-    - macos_arm64
-  win_platform:
-    - windows
-
 tasks:
-
+  verify_targets:
-  unix_test:
+    name: Build and test.
-    name: Verify build targets on Unix
+    platform: ${{ platform }}
-    platform: ${{ unix_platform }}
     bazel: ${{ bazel }}
-    build_flags:
-    - --cxxopt=-std=c++20
     build_targets:
+    - '@ftxui//:ftxui'
+    - '@ftxui//:screen'
     - '@ftxui//:dom'
     - '@ftxui//:component'
-    - '@ftxui//:screen'
+    test_targets:
+    - '@ftxui//:tests'
 
-  windows_test:
-    name: Verify build targets
-    platform: ${{ win_platform }}
-    bazel: ${{ bazel }}
-    build_flags:
-    - --cxxopt=/std:c++20
-    build_targets:
-    - '@ftxui//:dom'
-    - '@ftxui//:component'
-    - '@ftxui//:screen'

.github/workflows/build.yaml

@@ -14,30 +14,25 @@ on:
 jobs:
 
   test_bazel:
-    name: "Bazel, ${{ matrix.cxx }}, ${{ matrix.os }}"
+    name: "Bazel, ${{ matrix.compiler }}, ${{ matrix.os }}"
     strategy:
       fail-fast: false
       matrix:
         include:
           - os: ubuntu-latest
-            cxx: g++
+            compiler: gcc
-            cc: gcc
 
           - os: ubuntu-latest
-            cxx: clang++
+            compiler: llvm
-            cc: clang
 
           - os: macos-latest
-            cxx: g++
+            compiler: llvm
-            cc: gcc
 
           - os: macos-latest
-            cxx: clang++
+            compiler: gcc
-            cc: clang
 
           - os: windows-latest
-            cxx: cl
+            compiler: cl
-            cc: cl
 
     runs-on: ${{ matrix.os }}
     steps:
@@ -45,16 +40,10 @@ jobs:
         uses: actions/checkout@v3
 
       - name: "Build with Bazel"
-        env:
-          CC: ${{ matrix.cc }}
-          CXX: ${{ matrix.cxx }}
         run: bazel build ...
 
       - name: "Tests with Bazel"
-        env:
+        run: bazel run tests
-          CC: ${{ matrix.cc }}
-          CXX: ${{ matrix.cxx }}
-        run: bazel test --test_output=all ...
 
   test_cmake:
     name: "CMake, ${{ matrix.compiler }}, ${{ matrix.os }}"

BUILD.bazel

@@ -12,19 +12,23 @@
 load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
 load(":bazel/ftxui.bzl", "ftxui_cc_library")
 load(":bazel/ftxui.bzl", "generate_examples")
+load(":bazel/ftxui.bzl", "cpp20")
 load(":bazel/ftxui.bzl", "windows_copts")
 load(":bazel/ftxui.bzl", "pthread_linkopts")
 
-# A meta target depending on all of the ftxui submodules.
+package(default_visibility = ["//visibility:public"])
-# Note that component depends on dom and screen, so ftxui is just an alias for 
-# component.
-# ┌component──┐
-# │┌dom──────┐│
-# ││┌screen─┐││
-# └┴┴───────┴┴┘
-alias(name = "ftxui", actual = ":component")
 
-# @ftxui:screen is a module that provides a screen buffer and color management
+# A meta target that depends on all the ftxui sub modules.
+alias(
+    name = "ftxui",
+    # Note that :component depends on :dom, which depends on :screen. Bazel
+    # doesn't really support "public" and "private" dependencies. They are all
+    # public. This is equivalent to depending on all the submodules.
+    actual = ":component",
+    visibility = ["//visibility:public"],
+)
+
+# ftxui:screen is a module that provides a screen buffer and color management
 # for terminal applications. A screen is a 2D array of cells, each cell can
 # contain a glyph, a color, and other attributes. The library also provides
 # functions to manipulate the screen.
@@ -56,7 +60,7 @@ ftxui_cc_library(
     ],
 )
 
-# @ftxui:dom is a library that provides a way to create and manipulate a
+# ftxui:dom is a library that provides a way to create and manipulate a
 # "document" that can be rendered to a screen. The document is a tree of nodes.
 # Nodes can be text, layouts, or various decorators. Users needs to compose
 # nodes to create a document. A document is responsive to the size of the
@@ -126,7 +130,7 @@ ftxui_cc_library(
     deps = [":screen"],
 )
 
-# @ftxui:component is a library to create "dynamic" component renderering and
+# ftxui:component is a library to create "dynamic" component renderering and
 # updating a ftxui::dom document on the screen. It is a higher level API than
 # ftxui:dom.
 #
@@ -163,13 +167,6 @@ ftxui_cc_library(
         "src/ftxui/component/terminal_input_parser.hpp",
         "src/ftxui/component/util.cpp",
         "src/ftxui/component/window.cpp",
-
-        # Private header from ftxui:dom.
-        "src/ftxui/dom/node_decorator.hpp",
-
-        # Private header from ftxui:screen.
-        "src/ftxui/screen/string_internal.hpp",
-        "src/ftxui/screen/util.hpp",
     ],
     hdrs = [
         "include/ftxui/component/animation.hpp",
@@ -185,10 +182,7 @@ ftxui_cc_library(
         "include/ftxui/component/task.hpp",
     ],
     linkopts = pthread_linkopts(),
-    deps = [
+    deps = [":dom"],
-        ":dom",
-        ":screen",
-    ],
 )
 
 # FTXUI's tests
@@ -211,6 +205,7 @@ cc_test(
         "src/ftxui/component/resizable_split_test.cpp",
         "src/ftxui/component/slider_test.cpp",
         "src/ftxui/component/terminal_input_parser_test.cpp",
+        "src/ftxui/component/terminal_input_parser_test_fuzzer.cpp",
         "src/ftxui/component/toggle_test.cpp",
         "src/ftxui/dom/blink_test.cpp",
         "src/ftxui/dom/bold_test.cpp",
@@ -238,17 +233,6 @@ cc_test(
         "src/ftxui/screen/string_test.cpp",
         "src/ftxui/util/ref_test.cpp",
 
-        # Private header from ftxui:screen for string_test.cpp.
-        "src/ftxui/screen/string_internal.hpp",
-
-        # Private header from ftxui::component for
-        # terminal_input_parser_test.cpp.
-        "src/ftxui/component/terminal_input_parser.hpp",
-
-        # Private header from ftxui::dom for
-        # flexbox_helper_test.cpp.
-        "src/ftxui/dom/flexbox_helper.hpp",
-
         # TODO: Enable the two tests timing out with Bazel:
         # - "src/ftxui/component/screen_interactive_test.cpp",
         # - "src/ftxui/dom/selection_test.cpp",
@@ -257,12 +241,9 @@ cc_test(
         "include",
         "src",
     ],
-    copts = windows_copts(),
+    copts = cpp20() + windows_copts(),
     deps = [
-        ":screen",
+        "//:ftxui",
-        ":dom",
-        ":component",
-        "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],
 )

CHANGELOG.md

@@ -1,20 +1,9 @@
 Changelog
 =========
 
-6.1.9 (2025-05-07)
+Future release
 ------------
 
-### Build
-If all goes well (pending), ftxui should appear in the Bazel central repository.
-It can be imported into your project using the following lines:
-
-**MODULE.bazel**
-```bazel
-bazel_dep(name = "ftxui", version = "6.1.9")
-```
-
-Thanks @robinlinden and @kcc for the reviews.
-
 ### dom
 - Bugfix: Restore the `dbox` behavior from ftxui 5.0.0. To apply bgcolor
   blending between the two layers, a new `dboxBlend` will be added.
@@ -25,6 +14,13 @@ Thanks @robinlinden and @kcc for the reviews.
 ### Build
 - Feature: Support `bazel` build system. See #1032.
   Proposed by Kostya Serebryany @kcc
+  If all goes well (pending), it should appear in the Bazel central repository.
+  It can be imported into your project using the following lines:
+
+  **MODULE.bazel**
+  ```bazel
+  bazel_dep(name = "ftxui", version = "6.1.8")
+  ```
 
   **BUILD.bazel**
   ```bazel

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.12)
 
 project(ftxui
   LANGUAGES CXX
-  VERSION 6.1.9
+  VERSION 6.1.8
   DESCRIPTION "C++ Functional Terminal User Interface."
 )
 

MODULE.bazel

@@ -1,13 +1,9 @@
-# FTXUI module.
+# FTXUI Module.
-module(
+module(name = "ftxui", version = "6.1.8", compatibility_level = 6)
-    name = "ftxui",
-    version = "6.1.9",
-    compatibility_level = 6,
-)
 
-# Build dependencies.
+# Build deps.
 bazel_dep(name = "rules_cc", version = "0.1.1")
-bazel_dep(name = "platforms", version = "0.0.10")
+bazel_dep(name = "platforms", version = "0.0.11")
 
-# Test dependencies.
+# Test deps.
-bazel_dep(name = "googletest", version = "1.14.0.bcr.1", dev_dependency = True)
+bazel_dep(name = "googletest", version = "1.16.0.bcr.1")

README.md

@@ -348,7 +348,6 @@ Feel free to add your projects here:
 - [terminal-rain](https://github.com/Oakamoore/terminal-rain)
 - [keywords](https://github.com/Oakamoore/keywords) ([Play web version :heart:](https://oakamoore.itch.io/keywords))
 - [FTB - tertminal file browser](https://github.com/Cyxuan0311/FTB)
-- [SHOOT!](https://github.com/ShingZhanho/ENGG1340-Project-25Spring)
 
 ### [cpp-best-practices/game_jam](https://github.com/cpp-best-practices/game_jam)
 
@@ -373,7 +372,7 @@ include(FetchContent)
 
 FetchContent_Declare(ftxui
   GIT_REPOSITORY https://github.com/ArthurSonzogni/ftxui
-  GIT_TAG v6.1.9
+  GIT_TAG v6.1.8
 )
 
 FetchContent_GetProperties(ftxui)

bazel/ftxui.bzl

@@ -1,7 +1,24 @@
 # ftxui_common.bzl
 
 load("@rules_cc//cc:defs.bzl", "cc_library")
-load("@rules_cc//cc:defs.bzl", "cc_binary")
+
+def cpp17():
+    return select({
+        "@rules_cc//cc/compiler:msvc-cl": ["/std:c++17"],
+        "@rules_cc//cc/compiler:clang-cl": ["/std:c++17"],
+        "@rules_cc//cc/compiler:clang": ["-std=c++17"],
+        "@rules_cc//cc/compiler:gcc": ["-std=c++17"],
+        "//conditions:default": ["-std=c++17"],
+    })
+
+def cpp20():
+    return select({
+        "@rules_cc//cc/compiler:msvc-cl": ["/std:c++20"],
+        "@rules_cc//cc/compiler:clang-cl": ["/std:c++20"],
+        "@rules_cc//cc/compiler:clang": ["-std=c++20"],
+        "@rules_cc//cc/compiler:gcc": ["-std=c++20"],
+        "//conditions:default": ["-std=c++20"],
+    })
 
 # Microsoft terminal is a bit buggy ¯\_(ツ)_/¯ and MSVC uses bad defaults.
 def windows_copts():
@@ -28,8 +45,7 @@ def windows_copts():
       # This
       # - Replace missing font symbols by others.
       # - Reduce screen position pooling frequency to deals against a Microsoft
-      #   race condition. This was fixed in 2020, but clients are still using
+      #   race condition. This was fixed in 2020, but clients never not updated.
-      #   old versions.
       #   - https://github.com/microsoft/terminal/pull/7583
       #   - https://github.com/ArthurSonzogni/FTXUI/issues/136
       "-DFTXUI_MICROSOFT_TERMINAL_FALLBACK",
@@ -55,8 +71,8 @@ def pthread_linkopts():
 
 def ftxui_cc_library(
         name,
-        srcs = [],
+        srcs,
-        hdrs = [],
+        hdrs,
         linkopts = [],
         deps = []):
 
@@ -72,13 +88,12 @@ def ftxui_cc_library(
             "include",
             "src",
         ],
-        copts = windows_copts(),
+        copts = cpp17() + windows_copts(),
         visibility = ["//visibility:public"],
     )
 
 # Compile all the examples in the examples/ directory.
-# This is useful to check the Bazel is always synchronized against CMake
+# This is useful to check the Bazel is synchronized with CMake definitions.
-# definitions.
 def generate_examples():
     cpp_files = native.glob(["examples/**/*.cpp"])
 
@@ -92,13 +107,9 @@ def generate_examples():
         # Turn "examples/component/button.cpp" → "example_component_button"
         name = src.replace("/", "_").replace(".cpp", "")
 
-        cc_binary(
+        native.cc_binary(
             name = name,
             srcs = [src],
-            deps = [
+            deps = ["//:component"],
-              ":component",
+            copts = cpp20() + windows_copts(),
-              ":dom",
-              ":screen",
-            ],
-            copts = windows_copts(),
         )

src/ftxui/screen/terminal.cpp

@@ -48,25 +48,38 @@ Dimensions& FallbackSize() {
   return g_fallback_size;
 }
 
-const char* Safe(const char* c) {
-  return (c != nullptr) ? c : "";
-}
-
 bool Contains(const std::string& s, const char* key) {
   return s.find(key) != std::string::npos;
 }
 
+// https://github.com/gabime/spdlog/blob/885b5473e291833b148eeac3b7ce227e582cd88b/include/spdlog/details/os-inl.h#L566
+std::string getenv_safe(const char *field) {
+#if defined(_MSC_VER)
+#if defined(__cplusplus_winrt)
+  return std::string{};  // not supported under uwp
+#else
+  size_t len = 0;
+  char buf[1024];
+  bool ok = ::getenv_s(&len, buf, sizeof(buf), field) == 0;
+  return ok ? buf : std::string{};
+#endif
+#else  // revert to getenv
+  char *buf = ::getenv(field); // NOLINT(*-mt-unsafe)
+  return buf ? buf : std::string{};
+#endif
+}
+
 Terminal::Color ComputeColorSupport() {
 #if defined(__EMSCRIPTEN__)
   return Terminal::Color::TrueColor;
 #endif
 
-  std::string COLORTERM = Safe(std::getenv("COLORTERM"));  // NOLINT
+  std::string COLORTERM = getenv_safe("COLORTERM");
   if (Contains(COLORTERM, "24bit") || Contains(COLORTERM, "truecolor")) {
     return Terminal::Color::TrueColor;
   }
 
-  std::string TERM = Safe(std::getenv("TERM"));  // NOLINT
+  std::string TERM = getenv_safe("TERM");
   if (Contains(COLORTERM, "256") || Contains(TERM, "256")) {
     return Terminal::Color::Palette256;
   }

tools/test_bazel.sh

@@ -1,18 +0,0 @@
-# This script tests the project with different versions of Bazel and compilers
-# locally. This avoids waiting on the CI to run the tests.
-
-for ver in \
-  "6.0.0" \
-  "7.0.0" \
-  "8.0.0"
-do
-  for cc in \
-    "gcc" \
-    "clang"
-    do
-      echo "=== Testing with Bazel ${ver} with ${cc} ==="
-      USE_BAZEL_VERSION=${ver} CC=${cc} bazel clean --expunge
-      USE_BAZEL_VERSION=${ver} CC=${cc} bazel build //...
-      USE_BAZEL_VERSION=${ver} CC=${cc} bazel test //...
-    done
-  done