Clean up formatting

Author: hhenson

.clang-format

@@ -0,0 +1,51 @@
+---
+IndentWidth: 4
+---
+Language: Cpp
+Standard: c++20
+AlignConsecutiveAssignments: true
+AlignConsecutiveDeclarations: true
+AlignEscapedNewlines: Right
+AlignTrailingComments: true
+AllowShortBlocksOnASingleLine: Always
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: Always
+AllowShortLoopsOnASingleLine: true
+AllowShortLambdasOnASingleLine: All
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterCaseLabel: false
+  AfterControlStatement: false
+  AfterClass: true
+  AfterFunction: false
+  AfterNamespace: true
+  AfterStruct: true
+  BeforeCatch: false
+  BeforeElse: false
+  SplitEmptyFunction: false
+  SplitEmptyNamespace: false
+  SplitEmptyRecord: false
+  IndentBraces: false
+
+BreakBeforeBinaryOperators: None
+ColumnLimit: 132
+IndentCaseBlocks: true
+IndentCaseLabels: true
+IndentExternBlock: Indent
+IndentPPDirectives: BeforeHash
+NamespaceIndentation: All
+SpaceBeforeAssignmentOperators: true
+SpacesBeforeTrailingComments: 2
+SpaceBeforeCpp11BracedList: false
+UseCRLF: false
+IndentWidth: 4
+ReflowComments: true
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+
+
+
+
+
+

cpp/CMakeLists.txt

@@ -38,15 +38,15 @@ if (APPLE)
         set(CMAKE_OSX_DEPLOYMENT_TARGET "15.0" CACHE STRING "macOS deployment target" FORCE)
         set(ENV{MACOSX_DEPLOYMENT_TARGET} "15.0")
         message(STATUS "CMAKE_OSX_DEPLOYMENT_TARGET was unset. Defaulting to 15.0")
-    endif()
+    endif ()
 endif ()
 
 # Python and nanobind
 # Normalize variables from callers and ALWAYS use FindPython (not FindPython3),
 # because nanobind-config.cmake requires that 'find_package(Python ...)' has been invoked.
-if(DEFINED Python3_EXECUTABLE AND NOT DEFINED Python_EXECUTABLE)
+if (DEFINED Python3_EXECUTABLE AND NOT DEFINED Python_EXECUTABLE)
     set(Python_EXECUTABLE "${Python3_EXECUTABLE}")
-endif()
+endif ()
 # Required: Python interpreter + development module
 find_package(Python 3.12 COMPONENTS Interpreter Development.Module REQUIRED)
 include_directories(${Python_INCLUDE_DIRS})
@@ -56,22 +56,22 @@ execute_process(
         COMMAND "${Python_EXECUTABLE}" -c "import sysconfig; print(sysconfig.get_config_var('SOABI'), end='')"
         OUTPUT_VARIABLE Python_SOABI
         RESULT_VARIABLE _result)
-if(_result EQUAL 0 AND Python_SOABI)
+if (_result EQUAL 0 AND Python_SOABI)
     set(Python_SOABI "${Python_SOABI}" CACHE STRING "Python SOABI" FORCE)
-endif()
+endif ()
 
 # Resolve nanobind via the chosen interpreter and help CMake find it
 execute_process(
         COMMAND "${Python_EXECUTABLE}" -m nanobind --cmake_dir
         OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE nanobind_ROOT)
-if(nanobind_ROOT)
+if (nanobind_ROOT)
     set(nanobind_DIR "${nanobind_ROOT}" CACHE PATH "nanobind CMake package dir" FORCE)
-    if(DEFINED CMAKE_PREFIX_PATH)
+    if (DEFINED CMAKE_PREFIX_PATH)
         list(PREPEND CMAKE_PREFIX_PATH "${nanobind_ROOT}")
-    else()
+    else ()
         set(CMAKE_PREFIX_PATH "${nanobind_ROOT}")
-    endif()
-endif()
+    endif ()
+endif ()
 find_package(nanobind CONFIG REQUIRED)
 include_directories(${NB_DIR}/include)
 message(STATUS "Nanobind DIR: ${NB_DIR}/include")
@@ -86,9 +86,9 @@ if (NOT fmt_FOUND)
     include(FetchContent)
     FetchContent_Declare(fmt GIT_REPOSITORY https://github.com/fmtlib/fmt.git GIT_TAG 10.1.0)
     FetchContent_MakeAvailable(fmt)
-else()
+else ()
     message(STATUS "Found fmt via Conan/system: ${fmt_DIR}")
-endif()
+endif ()
 
 
 # backward-cpp via package or FetchContent (optional)
@@ -106,15 +106,15 @@ if (HGRAPH_WITH_BACKWARD)
         set(BACKWARD_HAS_DWARF OFF CACHE BOOL "Disable DWARF" FORCE)
         set(BACKWARD_HAS_UNWIND ON CACHE BOOL "Enable libunwind/backtrace if available" FORCE)
         FetchContent_MakeAvailable(backward)
-        if(TARGET backward)
+        if (TARGET backward)
             add_library(Backward::Backward ALIAS backward)
-        endif()
-    else()
+        endif ()
+    else ()
         message(STATUS "Found Backward via Conan/system: ${Backward_DIR}")
-    endif()
-else()
+    endif ()
+else ()
     message(STATUS "HGRAPH_WITH_BACKWARD=OFF: Skipping backward-cpp integration")
-endif()
+endif ()
 
 # Git version info is optional here (no .git necessarily inside this repo)
 set(GIT_BRANCH "")
@@ -127,7 +127,7 @@ if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
             OUTPUT_VARIABLE GIT_COMMIT_HASH OUTPUT_STRIP_TRAILING_WHITESPACE)
     execute_process(COMMAND git log -1 --format=%cD WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
             OUTPUT_VARIABLE GIT_COMMIT_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
-endif()
+endif ()
 
 message(STATUS "Git current branch: ${GIT_BRANCH}")
 message(STATUS "Git commit hash: ${GIT_COMMIT_HASH}")

cpp/include/hgraph/builders/builder.h

@@ -9,9 +9,7 @@
 
 #include <typeinfo>
 
-namespace hgraph
-{
-
+namespace hgraph {
     /**
      * The Builder class is responsible for constructing and initializing
      * the item type it is responsible for. It is also responsible for
@@ -21,10 +19,11 @@ namespace hgraph
      * This provides a guide to prepare the different builders, the actual implementations
      * will vary in terms of the make_instance parameters at least.
      */
-    struct Builder : nb::intrusive_base
-    {
+    struct Builder : nb::intrusive_base {
         Builder() = default;
+
         ~Builder() override = default;
+
         /**
          * Create a new instance of the item.
          * Any additional attributes required for construction are passed in as arguments.
@@ -47,4 +46,4 @@ namespace hgraph
         static void register_with_nanobind(nb::module_ &m);
     };
 }
-#endif //BUILDER_H
+#endif //BUILDER_H

cpp/include/hgraph/builders/graph_builder.h

@@ -7,57 +7,50 @@
 
 #include <hgraph/builders/builder.h>
 
-namespace hgraph
-{
-
-    struct Edge
-    {
-        int64_t                  src_node;
+namespace hgraph {
+    struct Edge {
+        int64_t src_node;
         std::vector<int64_t> output_path;
-        int64_t                  dst_node;
+        int64_t dst_node;
         std::vector<int64_t> input_path;
 
         Edge(int64_t src, std::vector<int64_t> out_path, int64_t dst, std::vector<int64_t> in_path);
 
         bool operator==(const Edge &other) const;
 
         bool operator<(const Edge &other) const;
-
     };
+} // namespace hgraph
 
-}  // namespace hgraph
-
-namespace std
-{
-    template <> struct hash<hgraph::Edge>
-    {
+namespace std {
+    template<>
+    struct hash<hgraph::Edge> {
         size_t operator()(const hgraph::Edge &edge) const noexcept;
     };
-}  // namespace std
+} // namespace std
 
 namespace hgraph {
     struct Graph;
 
-    struct GraphBuilder :  Builder
-    {
+    struct GraphBuilder : Builder {
         std::vector<node_builder_ptr> node_builders;
-        std::vector<Edge>     edges;
+        std::vector<Edge> edges;
 
-        GraphBuilder(std::vector<node_builder_ptr> node_builders, std::vector<Edge>     edges);
+        GraphBuilder(std::vector<node_builder_ptr> node_builders, std::vector<Edge> edges);
 
         /**
          * Construct an instance of a graph. The id provided is the id for the graph instance to be constructed.
          */
         graph_ptr make_instance(const std::vector<int64_t> &graph_id, node_ptr parent_node = nullptr,
-                                        const std::string &label = "") const;
+                                const std::string &label = "") const;
 
         /**
          * Make the nodes described in the node builders and connect the edges as described in the edges.
          * Return the iterable of newly constructed and wired nodes.
          * This can be used to feed into a new graph instance or to extend (or re-initialise) an existing graph.
          */
         std::vector<node_ptr> make_and_connect_nodes(const std::vector<int64_t> &graph_id,
-                                                             int64_t                     first_node_ndx) const;
+                                                     int64_t first_node_ndx) const;
 
         /**
          * Release resources constructed during the build process, plus the graph.
@@ -66,6 +59,5 @@ namespace hgraph {
 
         static void register_with_nanobind(nb::module_ &m);
     };
-
-};  // namespace hgraph
-#endif  // GRAPH_BUILDER_H
+}; // namespace hgraph
+#endif  // GRAPH_BUILDER_H

cpp/include/hgraph/builders/input_builder.h

@@ -7,13 +7,10 @@
 
 #include <hgraph/builders/builder.h>
 
-namespace hgraph
-{
-
+namespace hgraph {
     // The InputBuilder class implementation
 
-    struct InputBuilder : Builder
-    {
+    struct InputBuilder : Builder {
         using ptr = nb::ref<InputBuilder>;
 
         /**
@@ -36,7 +33,6 @@ namespace hgraph
 
         static void register_with_nanobind(nb::module_ &m);
     };
+} // namespace hgraph
 
-}  // namespace hgraph
-
-#endif  // INPUT_BUILDER_H
+#endif  // INPUT_BUILDER_H

cpp/include/hgraph/builders/node_builder.h

@@ -7,48 +7,44 @@
 
 #include <hgraph/builders/builder.h>
 
-namespace hgraph
-{
-
-    struct NodeBuilder : Builder
-    {
+namespace hgraph {
+    struct NodeBuilder : Builder {
         NodeBuilder(node_signature_ptr signature_, nb::dict scalars_,
-                    std::optional<input_builder_ptr>  input_builder_            = std::nullopt,
-                    std::optional<output_builder_ptr> output_builder_           = std::nullopt,
-                    std::optional<output_builder_ptr> error_builder_            = std::nullopt,
+                    std::optional<input_builder_ptr> input_builder_ = std::nullopt,
+                    std::optional<output_builder_ptr> output_builder_ = std::nullopt,
+                    std::optional<output_builder_ptr> error_builder_ = std::nullopt,
                     std::optional<output_builder_ptr> recordable_state_builder_ = std::nullopt);
 
         // Explicitly define move operations to avoid leaving Python-visible instances in a moved-from (null) state.
-        NodeBuilder(NodeBuilder&& other) noexcept;
+        NodeBuilder(NodeBuilder &&other) noexcept;
 
-        NodeBuilder & operator=(NodeBuilder&& other) noexcept;
+        NodeBuilder &operator=(NodeBuilder &&other) noexcept;
 
         // Default copy is fine (nb::ref increases refcount)
-        NodeBuilder(const NodeBuilder&) = default;
-        NodeBuilder& operator=(const NodeBuilder&) = default;
+        NodeBuilder(const NodeBuilder &) = default;
+
+        NodeBuilder &operator=(const NodeBuilder &) = default;
 
         virtual node_ptr make_instance(const std::vector<int64_t> &owning_graph_id, int64_t node_ndx) const = 0;
 
         virtual void release_instance(node_ptr &item) const;
 
         static void register_with_nanobind(nb::module_ &m);
 
-        node_signature_ptr                signature;
-        nb::dict                          scalars;
-        std::optional<input_builder_ptr>  input_builder;
+        node_signature_ptr signature;
+        nb::dict scalars;
+        std::optional<input_builder_ptr> input_builder;
         std::optional<output_builder_ptr> output_builder;
         std::optional<output_builder_ptr> error_builder;
         std::optional<output_builder_ptr> recordable_state_builder;
     };
 
-    struct BaseNodeBuilder : NodeBuilder
-    {
+    struct BaseNodeBuilder : NodeBuilder {
         using NodeBuilder::NodeBuilder;
 
-      protected:
+    protected:
         void _build_inputs_and_outputs(node_ptr node) const;
     };
+} // namespace hgraph
 
-}  // namespace hgraph
-
-#endif  // NODE_BUILDER_H
+#endif  // NODE_BUILDER_H